diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2013-10-17 14:12:56 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-10-28 15:24:26 -0400 |
commit | ce6cda1845cf2332d2c411a5c72cd166256b21da (patch) | |
tree | 2f1b0640b5331726f1ff492c48d72ffafb0fd5bc | |
parent | b03d735b4ca2375d2251195cd848713bc55e7d79 (diff) |
NFS: Add a super_block backpointer to the nfs_server struct
NFS_SB() returns the pointer to an nfs_server struct, given a
pointer to a super_block. But we have no way to go back the other
way.
Add a super_block backpointer field so that, given an nfs_server
struct, it is easy to get to the filesystem's root dentry.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r-- | fs/nfs/super.c | 1 | ||||
-rw-r--r-- | include/linux/nfs_fs_sb.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 3f5a7a85c9c2..e26647be69ce 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
@@ -2534,6 +2534,7 @@ struct dentry *nfs_fs_mount_common(struct nfs_server *server, | |||
2534 | mntroot = ERR_PTR(error); | 2534 | mntroot = ERR_PTR(error); |
2535 | goto error_splat_bdi; | 2535 | goto error_splat_bdi; |
2536 | } | 2536 | } |
2537 | server->super = s; | ||
2537 | } | 2538 | } |
2538 | 2539 | ||
2539 | if (!s->s_root) { | 2540 | if (!s->s_root) { |
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index f9c0a6cb41e9..46b0cb4bee09 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h | |||
@@ -148,6 +148,7 @@ struct nfs_server { | |||
148 | __u64 maxfilesize; /* maximum file size */ | 148 | __u64 maxfilesize; /* maximum file size */ |
149 | struct timespec time_delta; /* smallest time granularity */ | 149 | struct timespec time_delta; /* smallest time granularity */ |
150 | unsigned long mount_time; /* when this fs was mounted */ | 150 | unsigned long mount_time; /* when this fs was mounted */ |
151 | struct super_block *super; /* VFS super block */ | ||
151 | dev_t s_dev; /* superblock dev numbers */ | 152 | dev_t s_dev; /* superblock dev numbers */ |
152 | 153 | ||
153 | #ifdef CONFIG_NFS_FSCACHE | 154 | #ifdef CONFIG_NFS_FSCACHE |