mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 22:54:01 +00:00
Code Issues Releases Wiki Activity

NFSv4.1: Rename the pnfs_put_lseg_common to pnfs_layout_remove_lseg

Browse source 
The latter name is more descriptive of the actual function.
Also rename pnfs_insert_layout to pnfs_layout_insert_lseg.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2012-09-20 16:33:30 -04:00
parent bb346f6397
commit 57036a3776
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
fs/nfs/pnfs.c
View file

@ -319,21 +319,22 @@ static void free_lseg(struct pnfs_layout_segment *lseg)
struct inode *ino = lseg->pls_layout->plh_inode; struct inode *ino = lseg->pls_layout->plh_inode;
NFS_SERVER(ino)->pnfs_curr_ld->free_lseg(lseg); NFS_SERVER(ino)->pnfs_curr_ld->free_lseg(lseg);
/* Matched by pnfs_get_layout_hdr in pnfs_insert_layout */ /* Matched by pnfs_get_layout_hdr in pnfs_layout_insert_lseg */
pnfs_put_layout_hdr(NFS_I(ino)->layout); pnfs_put_layout_hdr(NFS_I(ino)->layout);
} }
static void static void
pnfs_put_lseg_common(struct pnfs_layout_segment *lseg) pnfs_layout_remove_lseg(struct pnfs_layout_hdr *lo,
struct pnfs_layout_segment *lseg)
{ {
struct inode *inode = lseg->pls_layout->plh_inode; struct inode *inode = lo->plh_inode;
WARN_ON(test_bit(NFS_LSEG_VALID, &lseg->pls_flags)); WARN_ON(test_bit(NFS_LSEG_VALID, &lseg->pls_flags));
list_del_init(&lseg->pls_list); list_del_init(&lseg->pls_list);
if (list_empty(&lseg->pls_layout->plh_segs)) { if (list_empty(&lo->plh_segs)) {
set_bit(NFS_LAYOUT_DESTROYED, &lseg->pls_layout->plh_flags); set_bit(NFS_LAYOUT_DESTROYED, &lo->plh_flags);
/* Matched by initial refcount set in alloc_init_layout_hdr */ /* Matched by initial refcount set in alloc_init_layout_hdr */
pnfs_put_layout_hdr_locked(lseg->pls_layout); pnfs_put_layout_hdr_locked(lo);
} }
rpc_wake_up(&NFS_SERVER(inode)->roc_rpcwaitq); rpc_wake_up(&NFS_SERVER(inode)->roc_rpcwaitq);
} }
@ -341,6 +342,7 @@ pnfs_put_lseg_common(struct pnfs_layout_segment *lseg)
void void
pnfs_put_lseg(struct pnfs_layout_segment *lseg) pnfs_put_lseg(struct pnfs_layout_segment *lseg)
{ {
struct pnfs_layout_hdr *lo;
struct inode *inode; struct inode *inode;
if (!lseg) if (!lseg)
@ -349,13 +351,14 @@ pnfs_put_lseg(struct pnfs_layout_segment *lseg)
dprintk("%s: lseg %p ref %d valid %d\n", __func__, lseg, dprintk("%s: lseg %p ref %d valid %d\n", __func__, lseg,
atomic_read(&lseg->pls_refcount), atomic_read(&lseg->pls_refcount),
test_bit(NFS_LSEG_VALID, &lseg->pls_flags)); test_bit(NFS_LSEG_VALID, &lseg->pls_flags));
inode = lseg->pls_layout->plh_inode; lo = lseg->pls_layout;
inode = lo->plh_inode;
if (atomic_dec_and_lock(&lseg->pls_refcount, &inode->i_lock)) { if (atomic_dec_and_lock(&lseg->pls_refcount, &inode->i_lock)) {
LIST_HEAD(free_me); LIST_HEAD(free_me);
pnfs_put_lseg_common(lseg); pnfs_layout_remove_lseg(lo, lseg);
list_add(&lseg->pls_list, &free_me);
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
list_add(&lseg->pls_list, &free_me);
pnfs_free_lseg_list(&free_me); pnfs_free_lseg_list(&free_me);
} }
} }
@ -443,7 +446,7 @@ static int mark_lseg_invalid(struct pnfs_layout_segment *lseg,
dprintk("%s: lseg %p ref %d\n", __func__, lseg, dprintk("%s: lseg %p ref %d\n", __func__, lseg,
atomic_read(&lseg->pls_refcount)); atomic_read(&lseg->pls_refcount));
if (atomic_dec_and_test(&lseg->pls_refcount)) { if (atomic_dec_and_test(&lseg->pls_refcount)) {
pnfs_put_lseg_common(lseg); pnfs_layout_remove_lseg(lseg->pls_layout, lseg);
list_add(&lseg->pls_list, tmp_list); list_add(&lseg->pls_list, tmp_list);
rv = 1; rv = 1;
} }
@ -861,7 +864,7 @@ cmp_layout(struct pnfs_layout_range *l1,
} }
static void static void
pnfs_insert_layout(struct pnfs_layout_hdr *lo, pnfs_layout_insert_lseg(struct pnfs_layout_hdr *lo,
struct pnfs_layout_segment *lseg) struct pnfs_layout_segment *lseg)
{ {
struct pnfs_layout_segment *lp; struct pnfs_layout_segment *lp;
@ -1211,7 +1214,7 @@ pnfs_layout_process(struct nfs4_layoutget *lgp)
init_lseg(lo, lseg); init_lseg(lo, lseg);
lseg->pls_range = res->range; lseg->pls_range = res->range;
pnfs_get_lseg(lseg); pnfs_get_lseg(lseg);
pnfs_insert_layout(lo, lseg); pnfs_layout_insert_lseg(lo, lseg);
if (res->return_on_close) { if (res->return_on_close) {
set_bit(NFS_LSEG_ROC, &lseg->pls_flags); set_bit(NFS_LSEG_ROC, &lseg->pls_flags);