NFSv4.1: Fix another refcount issue in pnfs_find_alloc_layout

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2012-10-02 15:41:05 -07:00
parent ae2bb03236
commit 251ec410c4

View File

@ -907,18 +907,19 @@ pnfs_find_alloc_layout(struct inode *ino,
dprintk("%s Begin ino=%p layout=%p\n", __func__, ino, nfsi->layout);
if (nfsi->layout) {
pnfs_get_layout_hdr(nfsi->layout);
return nfsi->layout;
}
if (nfsi->layout != NULL)
goto out_existing;
spin_unlock(&ino->i_lock);
new = alloc_init_layout_hdr(ino, ctx, gfp_flags);
spin_lock(&ino->i_lock);
if (likely(nfsi->layout == NULL)) /* Won the race? */
if (likely(nfsi->layout == NULL)) { /* Won the race? */
nfsi->layout = new;
else
pnfs_free_layout_hdr(new);
return new;
}
pnfs_free_layout_hdr(new);
out_existing:
pnfs_get_layout_hdr(nfsi->layout);
return nfsi->layout;
}