summaryrefslogtreecommitdiff
path: root/fs/nfs/dir.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 10:18:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 10:18:44 -0700
commitade61088bc77dd209f8edadbe544f1e5dad6c287 (patch)
tree50a2eb0b78a470f379801a5abc73ff822f1e47c0 /fs/nfs/dir.c
parent7eb1053fd00a8f0e2263697638e17da8a251aa74 (diff)
parent0522f6adedd2736cbca3c0e16ca51df668993eee (diff)
downloadlinux-ade61088bc77dd209f8edadbe544f1e5dad6c287.tar.gz
linux-ade61088bc77dd209f8edadbe544f1e5dad6c287.tar.bz2
linux-ade61088bc77dd209f8edadbe544f1e5dad6c287.zip
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: Fix another nfs_wb_page() deadlock NFS: Ensure that we mark the inode as dirty if we exit early from commit NFS: Fix a lock imbalance typo in nfs_access_cache_shrinker sunrpc: fix leak on error on socket xprt setup
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r--fs/nfs/dir.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index ee9a179ebdf3..db64854b7b09 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1741,6 +1741,7 @@ remove_lru_entry:
clear_bit(NFS_INO_ACL_LRU_SET, &nfsi->flags);
smp_mb__after_clear_bit();
}
+ spin_unlock(&inode->i_lock);
}
spin_unlock(&nfs_access_lru_lock);
nfs_access_free_list(&head);