The patch titled
fcntl(F_SETSIG) fix
has been removed from the -mm tree. Its filename is
fcntlf_setsig-fix.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: fcntl(F_SETSIG) fix
From: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
fcntl(F_SETSIG) no longer works on leases because
lease_release_private_callback() gets called as the lease is copied in
order to initialise it.
The problem is that lease_alloc() performs an unnecessary initialisation,
which sets the lease_manager_ops. Avoid the problem by allocating the
target lease structure using locks_alloc_lock().
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
akpm: this is speculative. If we backport this to -stable please make sure
it's the correct version.
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/locks.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff -puN fs/locks.c~fcntlf_setsig-fix fs/locks.c
--- a/fs/locks.c~fcntlf_setsig-fix
+++ a/fs/locks.c
@@ -1421,8 +1421,9 @@ static int __setlease(struct file *filp,
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);
@@ -1430,6 +1431,7 @@ static int __setlease(struct file *filp,
locks_insert_lock(before, fl);
*flp = fl;
+ error = 0;
out:
return error;
}
_
Patches currently in -mm which might be from trond.myklebust@xxxxxxxxxx are
add-newline-to-nfs-dprintk.patch
fcntlf_setsig-fix.patch
fs-cache-provide-a-filesystem-specific-syncable-page-bit.patch
fs-cache-generic-filesystem-caching-facility.patch
fs-cache-release-page-private-in-failed-readahead.patch
fs-cache-make-kafs-use-fs-cache.patch
nfs-use-local-caching.patch
fs-cache-cachefiles-ia64-missing-copy_page-export.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem.patch
autofs-make-sure-all-dentries-refs-are-released-before-calling-kill_anon_super.patch
vfs-destroy-the-dentries-contributed-by-a-superblock-on-unmounting.patch
restore-rogue-readahead-printk.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
