diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 19:34:09 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 19:34:09 +0100 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /fs/nfs/super.c | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'fs/nfs/super.c')
| -rw-r--r-- | fs/nfs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 8b28b95c9e4..a3b0061dfd4 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2459,7 +2459,7 @@ static int nfs4_xdev_get_sb(struct file_system_type *fs_type, int flags, compare_super = NULL; /* Get a superblock - note that we may end up sharing one that already exists */ - s = sget(&nfs_fs_type, compare_super, nfs_set_super, &sb_mntdata); + s = sget(&nfs4_fs_type, compare_super, nfs_set_super, &sb_mntdata); if (IS_ERR(s)) { error = PTR_ERR(s); goto out_err_nosb; @@ -2544,7 +2544,7 @@ static int nfs4_referral_get_sb(struct file_system_type *fs_type, int flags, compare_super = NULL; /* Get a superblock - note that we may end up sharing one that already exists */ - s = sget(&nfs_fs_type, compare_super, nfs_set_super, &sb_mntdata); + s = sget(&nfs4_fs_type, compare_super, nfs_set_super, &sb_mntdata); if (IS_ERR(s)) { error = PTR_ERR(s); goto out_err_nosb; |