From: Andrew Morton Cc: David Howells Signed-off-by: Andrew Morton --- drivers/infiniband/hw/ipath/ipath_fs.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff -puN drivers/infiniband/hw/ipath/ipath_fs.c~ipath-vs-nfs-permit-filesystem-to-override-root-dentry-on-mount drivers/infiniband/hw/ipath/ipath_fs.c --- 25/drivers/infiniband/hw/ipath/ipath_fs.c~ipath-vs-nfs-permit-filesystem-to-override-root-dentry-on-mount 2006-05-14 07:00:19.000000000 -0700 +++ 25-akpm/drivers/infiniband/hw/ipath/ipath_fs.c 2006-05-14 07:01:54.000000000 -0700 @@ -542,13 +542,15 @@ bail: return ret; } -static struct super_block *ipathfs_get_sb(struct file_system_type *fs_type, - int flags, const char *dev_name, - void *data) -{ - ipath_super = get_sb_single(fs_type, flags, data, - ipathfs_fill_super); - return ipath_super; +static int ipathfs_get_sb(struct file_system_type *fs_type, int flags, + const char *dev_name, void *data, struct vfsmount *mnt) +{ + int ret; + + ret = get_sb_single(fs_type, flags, data, ipathfs_fill_super, mnt); + if (ret >= 0) + ipath_super = mnt->mnt_sb; + return ret; } static void ipathfs_kill_super(struct super_block *s) _