linux-next: vfs tree build failure

linux-next: vfs tree build failure

[Stephen Rothwell]

Hi Al,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/xfs/linux-2.6/xfs_export.c: In function 'xfs_fs_get_parent':
fs/xfs/linux-2.6/xfs_export.c:201: error: incompatible type for argument 1 of 'd_obtain_alias'

Due to commit 8ee6b8fff20962d17a008e230006e48c7f79ade4 ("[PATCH] switch
all filesystems over to d_obtain_alias") from the vfs tree interacting
with commit 7836dda725873a5ce05d216295a452f16ccaab72 ("[XFS] Combine the
XFS and Linux inodes") from the xfs tree.

I must admit I am wondering why I am only seeing this error at this late
stage (the xfs commit is dated October 17) ...

I fixed it up by applying the following patch (which may be incorrect).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Oct 2008 17:16:00 +1100
Subject: [PATCH] vfs/xfs: fallout from i_vnode change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/xfs/linux-2.6/xfs_export.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c
index 263027f..dd71e86 100644
--- a/fs/xfs/linux-2.6/xfs_export.c
+++ b/fs/xfs/linux-2.6/xfs_export.c
@@ -198,7 +198,7 @@ xfs_fs_get_parent(
 	if (unlikely(error))
 		return ERR_PTR(-error);
 
-	return d_obtain_alias(cip->i_vnode);
+	return d_obtain_alias(&cip->i_vnode);
 }
 
 const struct export_operations xfs_export_operations = {
-- 
1.5.6.5

Re: linux-next: vfs tree build failure

[Dave Chinner]

On Mon, Oct 20, 2008 at 05:18:30PM +1100, Stephen Rothwell wrote:
> Hi Al,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> fs/xfs/linux-2.6/xfs_export.c: In function 'xfs_fs_get_parent':
> fs/xfs/linux-2.6/xfs_export.c:201: error: incompatible type for argument 1 of 'd_obtain_alias'
.....
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/xfs/linux-2.6/xfs_export.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c
> index 263027f..dd71e86 100644
> --- a/fs/xfs/linux-2.6/xfs_export.c
> +++ b/fs/xfs/linux-2.6/xfs_export.c
> @@ -198,7 +198,7 @@ xfs_fs_get_parent(
>  	if (unlikely(error))
>  		return ERR_PTR(-error);
>  
> -	return d_obtain_alias(cip->i_vnode);
> +	return d_obtain_alias(&cip->i_vnode);
>  }

Hmmmm - looks like the VFS patches aren't using the correct
accessor function like the original code did. The fix should
be:

+	return d_obtain_alias(VFS_I(cip));

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

Re: linux-next: vfs tree build failure

[Christoph Hellwig]

On Mon, Oct 20, 2008 at 06:13:38PM +1100, Dave Chinner wrote:
> >  
> > -	return d_obtain_alias(cip->i_vnode);
> > +	return d_obtain_alias(&cip->i_vnode);
> >  }
> 
> Hmmmm - looks like the VFS patches aren't using the correct
> accessor function like the original code did. The fix should
> be:
> 
> +	return d_obtain_alias(VFS_I(cip));

When I did the VFS patches VFS_I wasn't around yet..

linux-next: vfs tree build failure

[Stephen Rothwell]

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

Hi Al,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/namei.c: In function 'do_filp_open':
fs/namei.c:1740: error: too many arguments to function 'ima_file_check'
fs/namei.c:1800: error: too many arguments to function 'ima_file_check'

Caused by commit dbcbe631a87d21e429f156edee4ffdeb7dbd84ce ("ima: rename
ima_path_check to ima_file_check").

I have used the vfs tree from next-20100125 again today.

P.S. that commit has author Mimi Zohar <zohar@linux.vnet.ibm.com>, but is
signed off by only Eric Paris <eparis@redhat.com> and Al Viro
<viro@zeniv.linux.org.uk> (and merely acked by Zohar
<zohar@linux.vnet.ibm.com>).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: vfs tree build failure

[Al Viro]

On Thu, Jan 28, 2010 at 12:00:00PM +1100, Stephen Rothwell wrote:
> Hi Al,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> fs/namei.c: In function 'do_filp_open':
> fs/namei.c:1740: error: too many arguments to function 'ima_file_check'
> fs/namei.c:1800: error: too many arguments to function 'ima_file_check'

Huh?  Oh...

ed include/linux/ima.h <<EOF
/static.*ima_file_check/s/)/, int mask&/
w
q
EOF

would fix it.

linux-next: vfs tree build failure

[Stephen Rothwell]

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

Hi Al,

Today's linux-next build (x86_64 allmodconfig) failed like this:

ERROR: "ima_path_check" [fs/nfsd/nfsd.ko] undefined!

Caused by commit b35d5b4f7f47215f322bc6d9a1fd8499c11455d2 ("Fix
untangling ima mess, part 2 with counters").

I have used the vfs tree from next-20100125 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: vfs tree build failure

[Stephen Rothwell]

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

Hi Al,

Today's linux-next build (x86_64 allmodconfig) failed like this:

fs/cachefiles/interface.c: In function 'cachefiles_sync_cache':
fs/cachefiles/interface.c:357: error: 'sb' undeclared (first use in this function)

Caused by commit d8f9cc04fdc69bff74a835b2895acb46cd08999b ("enforce
->sync_fs is only called for rw superblock").

I have used the version of the vfs tree from next-20090506 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: vfs tree build failure

[Al Viro]

On Thu, May 07, 2009 at 01:53:33PM +1000, Stephen Rothwell wrote:
> Hi Al,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> fs/cachefiles/interface.c: In function 'cachefiles_sync_cache':
> fs/cachefiles/interface.c:357: error: 'sb' undeclared (first use in this function)
> 
> Caused by commit d8f9cc04fdc69bff74a835b2895acb46cd08999b ("enforce
> ->sync_fs is only called for rw superblock").
> 
> I have used the version of the vfs tree from next-20090506 for today.

s/sb/cache->mnt->mnt_sb/ in two lines...

linux-next: vfs tree build failure

[Stephen Rothwell]

Hi Al,

Today's linux-next build (x86_64 allmodconfig) failed like this:

fs/cachefiles/cf-daemon.c: In function 'cachefiles_daemon_cull':
fs/cachefiles/cf-daemon.c:576: error: dereferencing pointer to incomplete type
fs/cachefiles/cf-daemon.c:577: error: dereferencing pointer to incomplete type
fs/cachefiles/cf-daemon.c:578: error: dereferencing pointer to incomplete type
fs/cachefiles/cf-daemon.c: In function 'cachefiles_daemon_inuse':
fs/cachefiles/cf-daemon.c:652: error: dereferencing pointer to incomplete type
fs/cachefiles/cf-daemon.c:653: error: dereferencing pointer to incomplete type
fs/cachefiles/cf-daemon.c:654: error: dereferencing pointer to incomplete type

Caused by commit 96a16ef5cd64d79f9706b9dccdb180d248c46866 ("CacheFiles: A
cache that backs onto a mounted filesystem") (from the nfs tree)
interacting with commit 5ad4e53bd5406ee214ddc5a41f03f779b8b2d526 ("Get
rid of indirect include of fs_struct.h") (from the vfs tree).

I applied the following merge fixup patch.

David, Trond, this should be applicable to the nfs tree already.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Apr 2009 13:06:20 +1100
Subject: [PATCH] nfs: fixup for fallout from cleaning up includes of fs_struct.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/cachefiles/cf-daemon.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fs/cachefiles/cf-daemon.c b/fs/cachefiles/cf-daemon.c
index 6aa6e65..b285632 100644
--- a/fs/cachefiles/cf-daemon.c
+++ b/fs/cachefiles/cf-daemon.c
@@ -21,6 +21,7 @@
 #include <linux/mount.h>
 #include <linux/statfs.h>
 #include <linux/ctype.h>
+#include <linux/fs_struct.h>
 #include "cf-internal.h"
 
 static int cachefiles_daemon_open(struct inode *, struct file *);
-- 
1.6.2.1

Re: linux-next: vfs tree build failure

[Stephen Rothwell]

Hi David, Trond,

The vfs patch has now gone into Linus' tree ...

On Thu, 2 Apr 2009 13:12:11 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> fs/cachefiles/cf-daemon.c: In function 'cachefiles_daemon_cull':
> fs/cachefiles/cf-daemon.c:576: error: dereferencing pointer to incomplete type
> fs/cachefiles/cf-daemon.c:577: error: dereferencing pointer to incomplete type
> fs/cachefiles/cf-daemon.c:578: error: dereferencing pointer to incomplete type
> fs/cachefiles/cf-daemon.c: In function 'cachefiles_daemon_inuse':
> fs/cachefiles/cf-daemon.c:652: error: dereferencing pointer to incomplete type
> fs/cachefiles/cf-daemon.c:653: error: dereferencing pointer to incomplete type
> fs/cachefiles/cf-daemon.c:654: error: dereferencing pointer to incomplete type
> 
> Caused by commit 96a16ef5cd64d79f9706b9dccdb180d248c46866 ("CacheFiles: A
> cache that backs onto a mounted filesystem") (from the nfs tree)
> interacting with commit 5ad4e53bd5406ee214ddc5a41f03f779b8b2d526 ("Get
> rid of indirect include of fs_struct.h") (from the vfs tree).
> 
> I applied the following merge fixup patch.
> 
> David, Trond, this should be applicable to the nfs tree already.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 2 Apr 2009 13:06:20 +1100
> Subject: [PATCH] nfs: fixup for fallout from cleaning up includes of fs_struct.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/cachefiles/cf-daemon.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/fs/cachefiles/cf-daemon.c b/fs/cachefiles/cf-daemon.c
> index 6aa6e65..b285632 100644
> --- a/fs/cachefiles/cf-daemon.c
> +++ b/fs/cachefiles/cf-daemon.c
> @@ -21,6 +21,7 @@
>  #include <linux/mount.h>
>  #include <linux/statfs.h>
>  #include <linux/ctype.h>
> +#include <linux/fs_struct.h>
>  #include "cf-internal.h"
>  
>  static int cachefiles_daemon_open(struct inode *, struct file *);
> -- 
> 1.6.2.1
> 


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

linux-next: vfs tree build failure

[Stephen Rothwell]

Hi Al,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/namei.c: In function 'vfs_remote_path_lookup':
fs/namei.c:1192: error: implicit declaration of function 'put_fs_struct'

Caused by commit 498052bba55ecaff58db6a1436b0e25bfd75a7ff ("New
locking/refcounting for fs_struct") (from the vfs tree) interacting with
commit afc83ab4217a4b31cabdadd174bc3ea10b9fcb9d ("VFS: Add a VFS helper
function vfs_remote_path_lookup()") (from the nfs tree).

I applied the patch below as a merge fixup.  Please check it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Apr 2009 12:48:24 +1100
Subject: [PATCH] vfs: merge fix for put_fs_struct/free_fs_struct change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/namei.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index f9656be..09680d8 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1153,7 +1153,7 @@ int vfs_remote_path_lookup(struct dentry *dentry,
 
 	new_mnt_ns = create_private_mnt_ns(mnt, new_fs);
 	if (new_mnt_ns == NULL)
-		goto out_put_fs_struct;
+		goto out_free_fs_struct;
 
 	/* Create a private copy of current->nsproxy */
 	new_nsproxy = unshare_current_nsproxy();
@@ -1188,8 +1188,8 @@ int vfs_remote_path_lookup(struct dentry *dentry,
 out_put_mnt_ns:
 	put_mnt_ns(new_mnt_ns);
 
-out_put_fs_struct:
-	put_fs_struct(new_fs);
+out_free_fs_struct:
+	free_fs_struct(new_fs);
 out_err:
 	return error;
 }
-- 
1.6.2.1

Re: linux-next: vfs tree build failure

[Stephen Rothwell]

Hi Trond,

The vfs patch has now gone into Linus' tree ...

On Thu, 2 Apr 2009 12:52:06 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> fs/namei.c: In function 'vfs_remote_path_lookup':
> fs/namei.c:1192: error: implicit declaration of function 'put_fs_struct'
> 
> Caused by commit 498052bba55ecaff58db6a1436b0e25bfd75a7ff ("New
> locking/refcounting for fs_struct") (from the vfs tree) interacting with
> commit afc83ab4217a4b31cabdadd174bc3ea10b9fcb9d ("VFS: Add a VFS helper
> function vfs_remote_path_lookup()") (from the nfs tree).
> 
> I applied the patch below as a merge fixup.  Please check it.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 2 Apr 2009 12:48:24 +1100
> Subject: [PATCH] vfs: merge fix for put_fs_struct/free_fs_struct change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/namei.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/namei.c b/fs/namei.c
> index f9656be..09680d8 100644
> --- a/fs/namei.c
> +++ b/fs/namei.c
> @@ -1153,7 +1153,7 @@ int vfs_remote_path_lookup(struct dentry *dentry,
>  
>  	new_mnt_ns = create_private_mnt_ns(mnt, new_fs);
>  	if (new_mnt_ns == NULL)
> -		goto out_put_fs_struct;
> +		goto out_free_fs_struct;
>  
>  	/* Create a private copy of current->nsproxy */
>  	new_nsproxy = unshare_current_nsproxy();
> @@ -1188,8 +1188,8 @@ int vfs_remote_path_lookup(struct dentry *dentry,
>  out_put_mnt_ns:
>  	put_mnt_ns(new_mnt_ns);
>  
> -out_put_fs_struct:
> -	put_fs_struct(new_fs);
> +out_free_fs_struct:
> +	free_fs_struct(new_fs);
>  out_err:
>  	return error;
>  }
> -- 
> 1.6.2.1
> 


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

linux-next: vfs tree build failure

[Stephen Rothwell]

Hi Al,

Today's linux-next build (x86_64 allmodconfig) failed like this:

fs/ext4/super.c: In function 'ext4_quota_on':
fs/ext4/super.c:3437: error: 'nd' undeclared (first use in this function)

Caused by the merge of commit 7ffe1ea8949c75ecffb7a4d988bb881a9fa62fbe
("ext4: add checks for errors from jbd2" from Linus' tree and commit
6ac465f99b29f74ca5a62bc32a8772985d9a071b ("[PATCH] switch
quota_on-related stuff to kern_path()") from the vfs tree.

I added the following patch.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 15 Oct 2008 17:45:27 +1100
Subject: [PATCH] vfs: fix up merge of ext4

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/ext4/super.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4042fd4..2844e1d 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3434,7 +3434,7 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
 		err = jbd2_journal_flush(EXT4_SB(sb)->s_journal);
 		jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal);
 		if (err) {
-			path_put(&nd.path);
+			path_put(&path);
 			return err;
 		}
 	}
-- 
1.5.6.5