UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFSv4.1: Cleanup add a "pnfs_" prefix to mark_matching_lsegs_invalid 

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2012-09-18 20:43:31 -04:00
parent a0b0a6e39b
commit 49a85061b0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/callback_proc.c
View File

@ -158,7 +158,7 @@ static u32 initiate_file_draining(struct nfs_client *clp,
ino = lo->plh_inode; ino = lo->plh_inode;
spin_lock(&ino->i_lock); spin_lock(&ino->i_lock);
if (test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags) || if (test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags) ||
mark_matching_lsegs_invalid(lo, &free_me_list, pnfs_mark_matching_lsegs_invalid(lo, &free_me_list,
&args->cbl_range)) &args->cbl_range))
rv = NFS4ERR_DELAY; rv = NFS4ERR_DELAY;
else else
@ -211,7 +211,7 @@ static u32 initiate_bulk_draining(struct nfs_client *clp,
ino = lo->plh_inode; ino = lo->plh_inode;
spin_lock(&ino->i_lock); spin_lock(&ino->i_lock);
set_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags); set_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags);
if (mark_matching_lsegs_invalid(lo, &free_me_list, &range)) if (pnfs_mark_matching_lsegs_invalid(lo, &free_me_list, &range))
rv = NFS4ERR_DELAY; rv = NFS4ERR_DELAY;
list_del_init(&lo->plh_bulk_recall); list_del_init(&lo->plh_bulk_recall);
spin_unlock(&ino->i_lock); spin_unlock(&ino->i_lock);

6
fs/nfs/pnfs.c
View File

@ -390,7 +390,7 @@ static int mark_lseg_invalid(struct pnfs_layout_segment *lseg,
* after call. * after call.
*/ */
int int
mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo, pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo,
struct list_head *tmp_list, struct list_head *tmp_list,
struct pnfs_layout_range *recall_range) struct pnfs_layout_range *recall_range)
{ {
@ -458,7 +458,7 @@ pnfs_destroy_layout(struct nfs_inode *nfsi)
lo = nfsi->layout; lo = nfsi->layout;
if (lo) { if (lo) {
lo->plh_block_lgets++; /* permanently block new LAYOUTGETs */ lo->plh_block_lgets++; /* permanently block new LAYOUTGETs */
mark_matching_lsegs_invalid(lo, &tmp_list, NULL); pnfs_mark_matching_lsegs_invalid(lo, &tmp_list, NULL);
} }
spin_unlock(&nfsi->vfs_inode.i_lock); spin_unlock(&nfsi->vfs_inode.i_lock);
pnfs_free_lseg_list(&tmp_list); pnfs_free_lseg_list(&tmp_list);
@ -651,7 +651,7 @@ _pnfs_return_layout(struct inode *ino)
/* Reference matched in nfs4_layoutreturn_release */ /* Reference matched in nfs4_layoutreturn_release */
get_layout_hdr(lo); get_layout_hdr(lo);
empty = list_empty(&lo->plh_segs); empty = list_empty(&lo->plh_segs);
mark_matching_lsegs_invalid(lo, &tmp_list, NULL); pnfs_mark_matching_lsegs_invalid(lo, &tmp_list, NULL);
/* Don't send a LAYOUTRETURN if list was initially empty */ /* Don't send a LAYOUTRETURN if list was initially empty */
if (empty) { if (empty) {
spin_unlock(&ino->i_lock); spin_unlock(&ino->i_lock);

2
fs/nfs/pnfs.h
View File

@ -203,7 +203,7 @@ void pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo,
int pnfs_choose_layoutget_stateid(nfs4_stateid *dst, int pnfs_choose_layoutget_stateid(nfs4_stateid *dst,
struct pnfs_layout_hdr *lo, struct pnfs_layout_hdr *lo,
struct nfs4_state *open_state); struct nfs4_state *open_state);
int mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo, int pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo,
struct list_head *tmp_list, struct list_head *tmp_list,
struct pnfs_layout_range *recall_range); struct pnfs_layout_range *recall_range);
bool pnfs_roc(struct inode *ino); bool pnfs_roc(struct inode *ino);