diff options
| author | J. Bruce Fields <bfields@fieldses.org> | 2005-11-10 19:08:00 -0500 |
|---|---|---|
| committer | Chris Wright <chrisw@osdl.org> | 2005-11-24 14:10:08 -0800 |
| commit | b3834f71cb794d4dba1f9ed2fec8bc7ee2f40b7e (patch) | |
| tree | b774d90d979af24def0d24eeed20cb807b5a9d3c | |
| parent | 9761be89f5a057bf2bae57ca98990f89ad5edbe2 (diff) | |
[PATCH] VFS: Fix memory leak with file leases
The patch
http://linux.bkbits.net:8080/linux-2.6/diffs/fs/locks.c@1.70??nav=index.html
introduced a pretty nasty memory leak in the lease code. When freeing
the lease, the code in locks_delete_lock() will correctly clean up
the fasync queue, but when we return to fcntl_setlease(), the freed
fasync entry will be reinstated.
This patch ensures that we skip the call to fasync_helper() when we're
freeing up the lease.
Signed-off-by: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | fs/locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index f7daa5f48949..accbc3c0506f 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1418,7 +1418,7 @@ int fcntl_setlease(unsigned int fd, struct file *filp, long arg) lock_kernel(); error = __setlease(filp, arg, &flp); - if (error) + if (error || arg == F_UNLCK) goto out_unlock; error = fasync_helper(fd, filp, 1, &flp->fl_fasync); |