openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFSv4.1: Fix a reference leak in pnfs_update_layout 

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>
This commit is contained in:
Trond Myklebust 2012-09-20 21:25:19 -04:00
parent 1dfed2737d
commit 830ffb5657
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/nfs/pnfs.c
View File

@ -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)) {
@ -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 "
@ -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);