NFSv4.1: Cleanup; add "pnfs_" prefix to get_layout_hdr() and put_layout_hdr()
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
@@ -122,7 +122,7 @@ static struct pnfs_layout_hdr * get_layout_by_fh_locked(struct nfs_client *clp,
|
||||
ino = igrab(lo->plh_inode);
|
||||
if (!ino)
|
||||
continue;
|
||||
get_layout_hdr(lo);
|
||||
pnfs_get_layout_hdr(lo);
|
||||
return lo;
|
||||
}
|
||||
}
|
||||
@@ -166,7 +166,7 @@ static u32 initiate_file_draining(struct nfs_client *clp,
|
||||
pnfs_set_layout_stateid(lo, &args->cbl_stateid, true);
|
||||
spin_unlock(&ino->i_lock);
|
||||
pnfs_free_lseg_list(&free_me_list);
|
||||
put_layout_hdr(lo);
|
||||
pnfs_put_layout_hdr(lo);
|
||||
iput(ino);
|
||||
return rv;
|
||||
}
|
||||
@@ -198,7 +198,7 @@ static u32 initiate_bulk_draining(struct nfs_client *clp,
|
||||
list_for_each_entry(lo, &server->layouts, plh_layouts) {
|
||||
if (!igrab(lo->plh_inode))
|
||||
continue;
|
||||
get_layout_hdr(lo);
|
||||
pnfs_get_layout_hdr(lo);
|
||||
BUG_ON(!list_empty(&lo->plh_bulk_recall));
|
||||
list_add(&lo->plh_bulk_recall, &recall_list);
|
||||
}
|
||||
@@ -216,7 +216,7 @@ static u32 initiate_bulk_draining(struct nfs_client *clp,
|
||||
list_del_init(&lo->plh_bulk_recall);
|
||||
spin_unlock(&ino->i_lock);
|
||||
pnfs_free_lseg_list(&free_me_list);
|
||||
put_layout_hdr(lo);
|
||||
pnfs_put_layout_hdr(lo);
|
||||
iput(ino);
|
||||
}
|
||||
return rv;
|
||||
|
Reference in New Issue
Block a user