linux-next: vfs tree build failure

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux