From: Trond Myklebust Date: Mon, 4 Dec 2006 18:43:11 +0000 (+0100) Subject: fcntl(F_SETSIG) fix X-Git-Tag: v2.6.16.35-rc1~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=25e1dd8a73c6661c03104f53199b501be489888d;p=karo-tx-linux.git fcntl(F_SETSIG) fix 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 Signed-off-by: Adrian Bunk --- diff --git a/fs/locks.c b/fs/locks.c index 39b038bfd5cc..e414a86f9d5c 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1356,8 +1356,9 @@ static int __setlease(struct file *filp, long arg, struct file_lock **flp) 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); @@ -1365,6 +1366,7 @@ static int __setlease(struct file *filp, long arg, struct file_lock **flp) locks_insert_lock(before, fl); *flp = fl; + error = 0; out: return error; }