summaryrefslogtreecommitdiffstats
path: root/fs/nfs/filelayout
diff options
context:
space:
mode:
authorDave Wysochanski <dwysocha@redhat.com>2016-04-01 13:45:09 -0400
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2016-05-09 09:05:40 -0400
commitfe238e601d2519f259103ab65caea3b077ed7b39 (patch)
tree88b50933a24b69ccae24bb52f2f9bfb6b1dce2e7 /fs/nfs/filelayout
parented3743a6d4f309f5278c87a69e3125382b78455c (diff)
NFS: Save struct inode * inside nfs_commit_info to clarify usage of i_lock
Commit ea2cf22 created nfs_commit_info and saved &inode->i_lock inside this NFS specific structure. This obscures the usage of i_lock. Instead, save struct inode * so later it's clear the spinlock taken is i_lock. Should be no functional change. Signed-off-by: Dave Wysochanski <dwysocha@redhat.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs/filelayout')
-rw-r--r--fs/nfs/filelayout/filelayout.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
index 3384dc8e6683..3e50057eeadf 100644
--- a/fs/nfs/filelayout/filelayout.c
+++ b/fs/nfs/filelayout/filelayout.c
@@ -795,7 +795,7 @@ filelayout_alloc_commit_info(struct pnfs_layout_segment *lseg,
795 buckets[i].direct_verf.committed = NFS_INVALID_STABLE_HOW; 795 buckets[i].direct_verf.committed = NFS_INVALID_STABLE_HOW;
796 } 796 }
797 797
798 spin_lock(cinfo->lock); 798 spin_lock(&cinfo->inode->i_lock);
799 if (cinfo->ds->nbuckets >= size) 799 if (cinfo->ds->nbuckets >= size)
800 goto out; 800 goto out;
801 for (i = 0; i < cinfo->ds->nbuckets; i++) { 801 for (i = 0; i < cinfo->ds->nbuckets; i++) {
@@ -811,7 +811,7 @@ filelayout_alloc_commit_info(struct pnfs_layout_segment *lseg,
811 swap(cinfo->ds->buckets, buckets); 811 swap(cinfo->ds->buckets, buckets);
812 cinfo->ds->nbuckets = size; 812 cinfo->ds->nbuckets = size;
813out: 813out:
814 spin_unlock(cinfo->lock); 814 spin_unlock(&cinfo->inode->i_lock);
815 kfree(buckets); 815 kfree(buckets);
816 return 0; 816 return 0;
817} 817}