diff options
Diffstat (limited to 'fs/nfs/nfs4super.c')
-rw-r--r-- | fs/nfs/nfs4super.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c index 1f3401902c2f..8a505573c289 100644 --- a/fs/nfs/nfs4super.c +++ b/fs/nfs/nfs4super.c | |||
@@ -14,8 +14,6 @@ | |||
14 | 14 | ||
15 | static struct dentry *nfs4_remote_mount(struct file_system_type *fs_type, | 15 | static struct dentry *nfs4_remote_mount(struct file_system_type *fs_type, |
16 | int flags, const char *dev_name, void *raw_data); | 16 | int flags, const char *dev_name, void *raw_data); |
17 | static struct dentry *nfs4_xdev_mount(struct file_system_type *fs_type, | ||
18 | int flags, const char *dev_name, void *raw_data); | ||
19 | static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type, | 17 | static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type, |
20 | int flags, const char *dev_name, void *raw_data); | 18 | int flags, const char *dev_name, void *raw_data); |
21 | static struct dentry *nfs4_remote_referral_mount(struct file_system_type *fs_type, | 19 | static struct dentry *nfs4_remote_referral_mount(struct file_system_type *fs_type, |
@@ -37,14 +35,6 @@ static struct file_system_type nfs4_remote_fs_type = { | |||
37 | .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA, | 35 | .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA, |
38 | }; | 36 | }; |
39 | 37 | ||
40 | struct file_system_type nfs4_xdev_fs_type = { | ||
41 | .owner = THIS_MODULE, | ||
42 | .name = "nfs4", | ||
43 | .mount = nfs4_xdev_mount, | ||
44 | .kill_sb = nfs_kill_super, | ||
45 | .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA, | ||
46 | }; | ||
47 | |||
48 | static struct file_system_type nfs4_remote_referral_fs_type = { | 38 | static struct file_system_type nfs4_remote_referral_fs_type = { |
49 | .owner = THIS_MODULE, | 39 | .owner = THIS_MODULE, |
50 | .name = "nfs4", | 40 | .name = "nfs4", |
@@ -261,21 +251,6 @@ struct dentry *nfs4_try_mount(int flags, const char *dev_name, | |||
261 | return res; | 251 | return res; |
262 | } | 252 | } |
263 | 253 | ||
264 | /* | ||
265 | * Clone an NFS4 server record on xdev traversal (FSID-change) | ||
266 | */ | ||
267 | static struct dentry * | ||
268 | nfs4_xdev_mount(struct file_system_type *fs_type, int flags, | ||
269 | const char *dev_name, void *raw_data) | ||
270 | { | ||
271 | struct nfs_mount_info mount_info = { | ||
272 | .fill_super = nfs_clone_super, | ||
273 | .set_security = nfs_clone_sb_security, | ||
274 | .cloned = raw_data, | ||
275 | }; | ||
276 | return nfs_xdev_mount_common(&nfs4_fs_type, flags, dev_name, &mount_info); | ||
277 | } | ||
278 | |||
279 | static struct dentry * | 254 | static struct dentry * |
280 | nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags, | 255 | nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags, |
281 | const char *dev_name, void *raw_data) | 256 | const char *dev_name, void *raw_data) |