From 8807e48c39f0618e47b7d2e786ca066239b7ba08 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Thu, 20 Sep 2012 20:01:56 -0400 Subject: [PATCH] --- yaml --- r: 333146 b: refs/heads/master c: a9136d4914f61110ca9897ec65ab620075c50298 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/pnfs.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 733dd50f47e5..233e65d9e321 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f0d27dc5d77b084b2e2fe6d883c4d5776287842 +refs/heads/master: a9136d4914f61110ca9897ec65ab620075c50298 diff --git a/trunk/fs/nfs/pnfs.c b/trunk/fs/nfs/pnfs.c index bdd93b969050..edc8288fd3d4 100644 --- a/trunk/fs/nfs/pnfs.c +++ b/trunk/fs/nfs/pnfs.c @@ -859,7 +859,6 @@ pnfs_layout_insert_lseg(struct pnfs_layout_hdr *lo, dprintk("%s:Begin\n", __func__); - assert_spin_locked(&lo->plh_inode->i_lock); list_for_each_entry(lp, &lo->plh_segs, pls_list) { if (cmp_layout(&lseg->pls_range, &lp->pls_range) > 0) continue; @@ -913,7 +912,6 @@ pnfs_find_alloc_layout(struct inode *ino, dprintk("%s Begin ino=%p layout=%p\n", __func__, ino, nfsi->layout); - assert_spin_locked(&ino->i_lock); if (nfsi->layout) { if (test_bit(NFS_LAYOUT_DESTROYED, &nfsi->layout->plh_flags)) return NULL; @@ -970,7 +968,6 @@ pnfs_find_lseg(struct pnfs_layout_hdr *lo, dprintk("%s:Begin\n", __func__); - assert_spin_locked(&lo->plh_inode->i_lock); list_for_each_entry(lseg, &lo->plh_segs, pls_list) { if (test_bit(NFS_LSEG_VALID, &lseg->pls_flags) && is_matching_lseg(&lseg->pls_range, range)) {