git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index
7ec121c
..
7189834
100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-1409,8
+1409,9
@@
static int __setlease(struct file *filp, long arg, struct file_lock **flp)
if (!leases_enable)
goto out;
if (!leases_enable)
goto out;
- error = lease_alloc(filp, arg, &fl);
- if (error)
+ error = -ENOMEM;
+ fl = locks_alloc_lock();
+ if (fl == NULL)
goto out;
locks_copy_lock(fl, lease);
goto out;
locks_copy_lock(fl, lease);
@@
-1418,6
+1419,7
@@
static int __setlease(struct file *filp, long arg, struct file_lock **flp)
locks_insert_lock(before, fl);
*flp = fl;
locks_insert_lock(before, fl);
*flp = fl;
+ error = 0;
out:
return error;
}
out:
return error;
}