The Linux Kernel Mailing List
 help / color / mirror / Atom feed
* ecryptfs build failure
@ 2011-01-13 21:15 Sergey Senozhatsky
  2011-01-13 22:05 ` Tyler Hicks
  0 siblings, 1 reply; 3+ messages in thread
From: Sergey Senozhatsky @ 2011-01-13 21:15 UTC (permalink / raw)
  To: Tyler Hicks; +Cc: Dustin Kirkland, ecryptfs-devel, linux-kernel

Hello,

Recent kernel failed to build due to ecryptfs/main.
2 of 3 errors could be fixed with the following patch. The third is:
we make an assignment `lower_inode = lower_dentry->d_inode;' in
ecryptfs_get_inode, yet ecryptfs_get_inode knows nothing about lower_dentry.

---

 fs/ecryptfs/main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 9ed4769..5694d65 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -141,7 +141,7 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry)
 	return rc;
 }
 
-static inode *ecryptfs_get_inode(struct inode *lower_inode,
+static struct inode *ecryptfs_get_inode(struct inode *lower_inode,
 		       struct super_block *sb)
 {
 	struct inode *inode;
@@ -202,7 +202,7 @@ int ecryptfs_interpose(struct dentry *lower_dentry, struct dentry *dentry,
 {
 	struct inode *lower_inode = lower_dentry->d_inode;
 	struct inode *inode = ecryptfs_get_inode(lower_inode, sb);
-	if (IS_ERR(inode)
+	if (IS_ERR(inode))
 		return PTR_ERR(inode);
 	if (flags & ECRYPTFS_INTERPOSE_FLAG_D_ADD)
 		d_add(dentry, inode);


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: ecryptfs build failure
  2011-01-13 21:15 ecryptfs build failure Sergey Senozhatsky
@ 2011-01-13 22:05 ` Tyler Hicks
  2011-01-14  9:44   ` Sergey Senozhatsky
  0 siblings, 1 reply; 3+ messages in thread
From: Tyler Hicks @ 2011-01-13 22:05 UTC (permalink / raw)
  To: Sergey Senozhatsky; +Cc: Dustin Kirkland, ecryptfs-devel, linux-kernel

On Thu Jan 13, 2011 at 11:15:35PM +0200, Sergey Senozhatsky <sergey.senozhatsky@gmail.com> wrote:
> Hello,
> 
> Recent kernel failed to build due to ecryptfs/main.
> 2 of 3 errors could be fixed with the following patch. The third is:
> we make an assignment `lower_inode = lower_dentry->d_inode;' in
> ecryptfs_get_inode, yet ecryptfs_get_inode knows nothing about lower_dentry.

Thanks - This was mentioned just a little bit ago on LKML by Eric
Dumazet ([BUG] ECRYPT_FS) and Christoph responded with a patch. FWIW,
it doesn't look like the patch below addresses the lower_dentry issue in
ecryptfs_get_inode().

Tyler

> 
> ---
> 
>  fs/ecryptfs/main.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
> index 9ed4769..5694d65 100644
> --- a/fs/ecryptfs/main.c
> +++ b/fs/ecryptfs/main.c
> @@ -141,7 +141,7 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry)
>  	return rc;
>  }
> 
> -static inode *ecryptfs_get_inode(struct inode *lower_inode,
> +static struct inode *ecryptfs_get_inode(struct inode *lower_inode,
>  		       struct super_block *sb)
>  {
>  	struct inode *inode;
> @@ -202,7 +202,7 @@ int ecryptfs_interpose(struct dentry *lower_dentry, struct dentry *dentry,
>  {
>  	struct inode *lower_inode = lower_dentry->d_inode;
>  	struct inode *inode = ecryptfs_get_inode(lower_inode, sb);
> -	if (IS_ERR(inode)
> +	if (IS_ERR(inode))
>  		return PTR_ERR(inode);
>  	if (flags & ECRYPTFS_INTERPOSE_FLAG_D_ADD)
>  		d_add(dentry, inode);
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: ecryptfs build failure
  2011-01-13 22:05 ` Tyler Hicks
@ 2011-01-14  9:44   ` Sergey Senozhatsky
  0 siblings, 0 replies; 3+ messages in thread
From: Sergey Senozhatsky @ 2011-01-14  9:44 UTC (permalink / raw)
  To: Tyler Hicks; +Cc: Dustin Kirkland, ecryptfs-devel, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 788 bytes --]

On (01/13/11 16:05), Tyler Hicks wrote:
> On Thu Jan 13, 2011 at 11:15:35PM +0200, Sergey Senozhatsky <sergey.senozhatsky@gmail.com> wrote:
> > Hello,
> > 
> > Recent kernel failed to build due to ecryptfs/main.
> > 2 of 3 errors could be fixed with the following patch. The third is:
> > we make an assignment `lower_inode = lower_dentry->d_inode;' in
> > ecryptfs_get_inode, yet ecryptfs_get_inode knows nothing about lower_dentry.
> 
> Thanks - This was mentioned just a little bit ago on LKML by Eric
> Dumazet ([BUG] ECRYPT_FS) and Christoph responded with a patch. 
Fixed now. Cool.

> FWIW, it doesn't look like the patch below addresses the lower_dentry issue in
> ecryptfs_get_inode().
> 

Oops. Sorry. Nevermind, sent you v1 instead of v2.

Thanks,
	Sergey

[-- Attachment #2: Type: application/pgp-signature, Size: 316 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-01-14  9:44 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-13 21:15 ecryptfs build failure Sergey Senozhatsky
2011-01-13 22:05 ` Tyler Hicks
2011-01-14  9:44   ` Sergey Senozhatsky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox