From: Pavel Emelyanov I have noticed, that one hunk was lost and one duplicated during merging the fix-potential-oops-in-generic_setlease(-xxx) patches. One of the fixes is already in the hot-fixes, but the second one is still lost. The returned pointer was not the one allocated, but some temporary used to scan through the inode's locks list. This caused and OOPS during Kamalesh's testing. Signed-off-by: Pavel Emelyanov Cc: "J. Bruce Fields" Signed-off-by: Andrew Morton --- fs/locks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/locks.c~fix-potential-oops-in-generic_setlease-fix fs/locks.c --- a/fs/locks.c~fix-potential-oops-in-generic_setlease-fix +++ a/fs/locks.c @@ -1414,7 +1414,7 @@ int generic_setlease(struct file *filp, locks_copy_lock(new_fl, lease); locks_insert_lock(before, new_fl); - *flp = fl; + *flp = new_fl; return 0; out: _