diff options
author | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 17:49:32 +1100 |
---|---|---|
committer | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 17:50:21 +1100 |
commit | b7ab39f631f505edc2bbdb86620d5493f995c9da (patch) | |
tree | 62be97ebc7fc69ceb601f23312d335ebb8038ee7 /fs/locks.c | |
parent | 2304450783dfde7b0b94ae234edd0dbffa865073 (diff) | |
download | kernel_samsung_tuna-b7ab39f631f505edc2bbdb86620d5493f995c9da.zip kernel_samsung_tuna-b7ab39f631f505edc2bbdb86620d5493f995c9da.tar.gz kernel_samsung_tuna-b7ab39f631f505edc2bbdb86620d5493f995c9da.tar.bz2 |
fs: dcache scale dentry refcount
Make d_count non-atomic and protect it with d_lock. This allows us to ensure a
0 refcount dentry remains 0 without dcache_lock. It is also fairly natural when
we start protecting many other dentry members with d_lock.
Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'fs/locks.c')
-rw-r--r-- | fs/locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1389,7 +1389,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) goto out; if ((arg == F_WRLCK) - && ((atomic_read(&dentry->d_count) > 1) + && ((dentry->d_count > 1) || (atomic_read(&inode->i_count) > 1))) goto out; } |