diff options
| author | Trond Myklebust | 2012-09-20 23:31:43 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2012-09-28 22:03:14 +0200 |
| commit | 9c6263819f25254f2ed48f076b50096dd5893dfb (patch) | |
| tree | d95527cbeba0d44973f286602a35ff2c21c811bd /fs/nfs/callback_proc.c | |
| parent | NFSv4.1: Free the pnfs_layout_hdr outside the inode->i_lock (diff) | |
| download | kernel-qcow2-linux-9c6263819f25254f2ed48f076b50096dd5893dfb.tar.gz kernel-qcow2-linux-9c6263819f25254f2ed48f076b50096dd5893dfb.tar.xz kernel-qcow2-linux-9c6263819f25254f2ed48f076b50096dd5893dfb.zip | |
NFSv4.1: Clean up the removal of pnfs_layout_hdr from the server list
Move the code into pnfs_free_layout_hdr(), and add checks to
get_layout_by_fh_locked to ensure that they don't reference a layout
that is being freed.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/callback_proc.c')
| -rw-r--r-- | fs/nfs/callback_proc.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index 24252fea2c9c..76b4a7a3e559 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -122,7 +122,15 @@ static struct pnfs_layout_hdr * get_layout_by_fh_locked(struct nfs_client *clp, ino = igrab(lo->plh_inode); if (!ino) continue; + spin_lock(&ino->i_lock); + /* Is this layout in the process of being freed? */ + if (NFS_I(ino)->layout != lo) { + spin_unlock(&ino->i_lock); + iput(ino); + continue; + } pnfs_get_layout_hdr(lo); + spin_unlock(&ino->i_lock); return lo; } } @@ -196,9 +204,18 @@ static u32 initiate_bulk_draining(struct nfs_client *clp, continue; list_for_each_entry(lo, &server->layouts, plh_layouts) { - if (!igrab(lo->plh_inode)) + ino = igrab(lo->plh_inode); + if (ino) + continue; + spin_lock(&ino->i_lock); + /* Is this layout in the process of being freed? */ + if (NFS_I(ino)->layout != lo) { + spin_unlock(&ino->i_lock); + iput(ino); continue; + } pnfs_get_layout_hdr(lo); + spin_unlock(&ino->i_lock); BUG_ON(!list_empty(&lo->plh_bulk_recall)); list_add(&lo->plh_bulk_recall, &recall_list); } |