From: Dave Chinner Date: Tue, 12 Apr 2011 09:18:08 +0000 (+1000) Subject: nfs: don't call __mark_inode_dirty while holding i_lock X-Git-Tag: v2.6.39-rc4~66 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d88f6e804c824454b5ed0d3034ed3dcf7467a87;p=pandora-kernel.git nfs: don't call __mark_inode_dirty while holding i_lock nfs_scan_commit() is called with the inode->i_lock held, but it then calls __mark_inode_dirty() while still holding the lock. This causes a deadlock. Push the inode->i_lock into nfs_scan_commit() so it can protect only the parts of the code it needs to and can be dropped before the call to __mark_inode_dirty() to avoid the deadlock. Signed-off-by: Dave Chinner Tested-by: Will Simoneau Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed