diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-01-17 09:51:46 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-01-17 09:51:46 +0100 |
commit | 6eadf1075c6f923fece419e38cf05bff559aefcd (patch) | |
tree | b743ce0a3743d6f1b915b19b077a6d5bad980ea1 /fs/locks.c | |
parent | a1c611745c8c4e8996c1877d4e5d0fc95f227c38 (diff) | |
parent | c10076c4304083af15a41f6bc5e657e781c1f9a6 (diff) |
Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
Diffstat (limited to 'fs/locks.c')
-rw-r--r-- | fs/locks.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/fs/locks.c b/fs/locks.c index 3b0d05dcd7c..637694bf3a0 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1205,6 +1205,8 @@ int __break_lease(struct inode *inode, unsigned int mode) int want_write = (mode & O_ACCMODE) != O_RDONLY; new_fl = lease_alloc(NULL, want_write ? F_WRLCK : F_RDLCK); + if (IS_ERR(new_fl)) + return PTR_ERR(new_fl); lock_flocks(); @@ -1221,12 +1223,6 @@ int __break_lease(struct inode *inode, unsigned int mode) if (fl->fl_owner == current->files) i_have_this_lease = 1; - if (IS_ERR(new_fl) && !i_have_this_lease - && ((mode & O_NONBLOCK) == 0)) { - error = PTR_ERR(new_fl); - goto out; - } - break_time = 0; if (lease_break_time > 0) { break_time = jiffies + lease_break_time * HZ; @@ -1284,8 +1280,7 @@ restart: out: unlock_flocks(); - if (!IS_ERR(new_fl)) - locks_free_lock(new_fl); + locks_free_lock(new_fl); return error; } |