diff options
author | Tony Lindgren <tony@atomide.com> | 2011-01-10 17:23:41 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-01-10 17:23:41 -0500 |
commit | 274353674dd0337bdeeaee08a9f2047777b07ab0 (patch) | |
tree | b788d77dd7c0e8f27bbcc89fc742c212c28872c0 /fs/locks.c | |
parent | 1740d483ba4d79f9fa6984dccd7152b6b208f1bf (diff) | |
parent | d7cd5c73cec2dfa9f259a2adcf802c9f8fcc125f (diff) |
Merge branch 'ehci-omap-clock' into omap-fixes
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 8729347bcd1a..08415b2a6d36 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -1389,7 +1389,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) | |||
1389 | if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) | 1389 | if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) |
1390 | goto out; | 1390 | goto out; |
1391 | if ((arg == F_WRLCK) | 1391 | if ((arg == F_WRLCK) |
1392 | && ((atomic_read(&dentry->d_count) > 1) | 1392 | && ((dentry->d_count > 1) |
1393 | || (atomic_read(&inode->i_count) > 1))) | 1393 | || (atomic_read(&inode->i_count) > 1))) |
1394 | goto out; | 1394 | goto out; |
1395 | } | 1395 | } |