diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-09-18 20:51:13 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-09-28 16:03:07 -0400 |
commit | 70c3bd2bdf9a3c7c9282c362a4ec9ec88c713e13 (patch) | |
tree | cd1bbe74ec866d820b344b3d6d4c4c25e4c2e960 /fs/nfs/callback_proc.c | |
parent | 49a85061b0bc9cb26361096482c81172c666c937 (diff) |
NFSv4.1: Cleanup; add "pnfs_" prefix to get_layout_hdr() and put_layout_hdr()
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/callback_proc.c')
-rw-r--r-- | fs/nfs/callback_proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index 57b8bda0f4e9..24252fea2c9c 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c | |||
@@ -122,7 +122,7 @@ static struct pnfs_layout_hdr * get_layout_by_fh_locked(struct nfs_client *clp, | |||
122 | ino = igrab(lo->plh_inode); | 122 | ino = igrab(lo->plh_inode); |
123 | if (!ino) | 123 | if (!ino) |
124 | continue; | 124 | continue; |
125 | get_layout_hdr(lo); | 125 | pnfs_get_layout_hdr(lo); |
126 | return lo; | 126 | return lo; |
127 | } | 127 | } |
128 | } | 128 | } |
@@ -166,7 +166,7 @@ static u32 initiate_file_draining(struct nfs_client *clp, | |||
166 | pnfs_set_layout_stateid(lo, &args->cbl_stateid, true); | 166 | pnfs_set_layout_stateid(lo, &args->cbl_stateid, true); |
167 | spin_unlock(&ino->i_lock); | 167 | spin_unlock(&ino->i_lock); |
168 | pnfs_free_lseg_list(&free_me_list); | 168 | pnfs_free_lseg_list(&free_me_list); |
169 | put_layout_hdr(lo); | 169 | pnfs_put_layout_hdr(lo); |
170 | iput(ino); | 170 | iput(ino); |
171 | return rv; | 171 | return rv; |
172 | } | 172 | } |
@@ -198,7 +198,7 @@ static u32 initiate_bulk_draining(struct nfs_client *clp, | |||
198 | list_for_each_entry(lo, &server->layouts, plh_layouts) { | 198 | list_for_each_entry(lo, &server->layouts, plh_layouts) { |
199 | if (!igrab(lo->plh_inode)) | 199 | if (!igrab(lo->plh_inode)) |
200 | continue; | 200 | continue; |
201 | get_layout_hdr(lo); | 201 | pnfs_get_layout_hdr(lo); |
202 | BUG_ON(!list_empty(&lo->plh_bulk_recall)); | 202 | BUG_ON(!list_empty(&lo->plh_bulk_recall)); |
203 | list_add(&lo->plh_bulk_recall, &recall_list); | 203 | list_add(&lo->plh_bulk_recall, &recall_list); |
204 | } | 204 | } |
@@ -216,7 +216,7 @@ static u32 initiate_bulk_draining(struct nfs_client *clp, | |||
216 | list_del_init(&lo->plh_bulk_recall); | 216 | list_del_init(&lo->plh_bulk_recall); |
217 | spin_unlock(&ino->i_lock); | 217 | spin_unlock(&ino->i_lock); |
218 | pnfs_free_lseg_list(&free_me_list); | 218 | pnfs_free_lseg_list(&free_me_list); |
219 | put_layout_hdr(lo); | 219 | pnfs_put_layout_hdr(lo); |
220 | iput(ino); | 220 | iput(ino); |
221 | } | 221 | } |
222 | return rv; | 222 | return rv; |