diff options
author | Fred Isaman <iisaman@netapp.com> | 2011-01-06 06:36:21 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-06 14:46:31 -0500 |
commit | b7edfaa1983362842351e425adeb8e297b4c11fb (patch) | |
tree | b0c05e48ecc4d14a72a7e4b704c27a1080d745fb /fs/nfs/nfs4filelayout.c | |
parent | 566052c53b5146e23a99ab95fb5c11f8a295a084 (diff) |
pnfs: add prefix to struct pnfs_layout_hdr fields
Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4filelayout.c')
-rw-r--r-- | fs/nfs/nfs4filelayout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 738d6a4e77fe..23f930caf1e2 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c | |||
@@ -82,7 +82,7 @@ filelayout_check_layout(struct pnfs_layout_hdr *lo, | |||
82 | { | 82 | { |
83 | struct nfs4_file_layout_dsaddr *dsaddr; | 83 | struct nfs4_file_layout_dsaddr *dsaddr; |
84 | int status = -EINVAL; | 84 | int status = -EINVAL; |
85 | struct nfs_server *nfss = NFS_SERVER(lo->inode); | 85 | struct nfs_server *nfss = NFS_SERVER(lo->plh_inode); |
86 | 86 | ||
87 | dprintk("--> %s\n", __func__); | 87 | dprintk("--> %s\n", __func__); |
88 | 88 | ||
@@ -101,7 +101,7 @@ filelayout_check_layout(struct pnfs_layout_hdr *lo, | |||
101 | /* find and reference the deviceid */ | 101 | /* find and reference the deviceid */ |
102 | dsaddr = nfs4_fl_find_get_deviceid(nfss->nfs_client, id); | 102 | dsaddr = nfs4_fl_find_get_deviceid(nfss->nfs_client, id); |
103 | if (dsaddr == NULL) { | 103 | if (dsaddr == NULL) { |
104 | dsaddr = get_device_info(lo->inode, id); | 104 | dsaddr = get_device_info(lo->plh_inode, id); |
105 | if (dsaddr == NULL) | 105 | if (dsaddr == NULL) |
106 | goto out; | 106 | goto out; |
107 | } | 107 | } |
@@ -243,7 +243,7 @@ filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, | |||
243 | static void | 243 | static void |
244 | filelayout_free_lseg(struct pnfs_layout_segment *lseg) | 244 | filelayout_free_lseg(struct pnfs_layout_segment *lseg) |
245 | { | 245 | { |
246 | struct nfs_server *nfss = NFS_SERVER(lseg->pls_layout->inode); | 246 | struct nfs_server *nfss = NFS_SERVER(lseg->pls_layout->plh_inode); |
247 | struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg); | 247 | struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg); |
248 | 248 | ||
249 | dprintk("--> %s\n", __func__); | 249 | dprintk("--> %s\n", __func__); |