diff options
| author | Al Viro | 2013-07-05 16:59:33 +0200 |
|---|---|---|
| committer | Al Viro | 2013-07-05 16:59:33 +0200 |
| commit | 84d08fa888e7c2d53b5bbc764db2ef02968b499c (patch) | |
| tree | fa891009d778586eefdf3be8a11671ab9aefb13a /fs/locks.c | |
| parent | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux (diff) | |
| download | kernel-qcow2-linux-84d08fa888e7c2d53b5bbc764db2ef02968b499c.tar.gz kernel-qcow2-linux-84d08fa888e7c2d53b5bbc764db2ef02968b499c.tar.xz kernel-qcow2-linux-84d08fa888e7c2d53b5bbc764db2ef02968b499c.zip | |
helper for reading ->d_count
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index 04e2c1fdb157..c98e1a1431ea 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1454,7 +1454,7 @@ static int generic_add_lease(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) - && ((dentry->d_count > 1) + && ((d_count(dentry) > 1) || (atomic_read(&inode->i_count) > 1))) goto out; |