Skip to content

Commit

Permalink
NFSv4.1: Fix a reference leak in pnfs_update_layout
Browse files Browse the repository at this point in the history
If we exit after the call to pnfs_find_alloc_layout(), we have to ensure
that we put the struct pnfs_layout_hdr.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Sep 28, 2012
1 parent 1dfed27 commit 830ffb5
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions fs/nfs/pnfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1067,8 +1067,10 @@ pnfs_update_layout(struct inode *ino,

spin_lock(&ino->i_lock);
lo = pnfs_find_alloc_layout(ino, ctx, gfp_flags);
if (lo == NULL)
goto out_unlock;
if (lo == NULL) {
spin_unlock(&ino->i_lock);
goto out;
}

/* Do we even need to bother with this? */
if (test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags)) {
Expand Down Expand Up @@ -1122,6 +1124,7 @@ pnfs_update_layout(struct inode *ino,
spin_unlock(&clp->cl_lock);
}
atomic_dec(&lo->plh_outstanding);
out_put_layout_hdr:
pnfs_put_layout_hdr(lo);
out:
dprintk("%s: inode %s/%llu pNFS layout segment %s for "
Expand All @@ -1135,7 +1138,7 @@ pnfs_update_layout(struct inode *ino,
return lseg;
out_unlock:
spin_unlock(&ino->i_lock);
goto out;
goto out_put_layout_hdr;
}
EXPORT_SYMBOL_GPL(pnfs_update_layout);

Expand Down

0 comments on commit 830ffb5

Please sign in to comment.