projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-3.19-fin' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-2.6-microblaze.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index
735b8d3
..
59e2f90
100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-1702,7
+1702,7
@@
static int generic_delete_lease(struct file *filp)
break;
}
trace_generic_delete_lease(inode, fl);
- if (fl)
+ if (fl
&& IS_LEASE(fl)
)
error = fl->fl_lmops->lm_change(before, F_UNLCK, &dispose);
spin_unlock(&inode->i_lock);
locks_dispose_list(&dispose);