Skip to content

Commit

Permalink
NFSv4.1: Clean up pnfs_put_lseg()
Browse files Browse the repository at this point in the history
There is no longer a need to use pnfs_free_lseg_list(). Just call
pnfs_free_lseg() directly.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Sep 28, 2012
1 parent 9c62638 commit 905ca19
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions fs/nfs/pnfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ init_lseg(struct pnfs_layout_hdr *lo, struct pnfs_layout_segment *lseg)
lseg->pls_layout = lo;
}

static void free_lseg(struct pnfs_layout_segment *lseg)
static void pnfs_free_lseg(struct pnfs_layout_segment *lseg)
{
struct inode *ino = lseg->pls_layout->plh_inode;

Expand Down Expand Up @@ -352,12 +352,9 @@ pnfs_put_lseg(struct pnfs_layout_segment *lseg)
lo = lseg->pls_layout;
inode = lo->plh_inode;
if (atomic_dec_and_lock(&lseg->pls_refcount, &inode->i_lock)) {
LIST_HEAD(free_me);

pnfs_layout_remove_lseg(lo, lseg);
spin_unlock(&inode->i_lock);
list_add(&lseg->pls_list, &free_me);
pnfs_free_lseg_list(&free_me);
pnfs_free_lseg(lseg);
}
}
EXPORT_SYMBOL_GPL(pnfs_put_lseg);
Expand Down Expand Up @@ -494,7 +491,7 @@ pnfs_free_lseg_list(struct list_head *free_me)

list_for_each_entry_safe(lseg, tmp, free_me, pls_list) {
list_del(&lseg->pls_list);
free_lseg(lseg);
pnfs_free_lseg(lseg);
}
}

Expand Down

0 comments on commit 905ca19

Please sign in to comment.