Commit b3834f71 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Chris Wright

[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: default avatarJ. Bruce Fields <bfields@fieldses.org>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatarChris Wright <chrisw@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9761be89
...@@ -1418,7 +1418,7 @@ int fcntl_setlease(unsigned int fd, struct file *filp, long arg) ...@@ -1418,7 +1418,7 @@ int fcntl_setlease(unsigned int fd, struct file *filp, long arg)
lock_kernel(); lock_kernel();
error = __setlease(filp, arg, &flp); error = __setlease(filp, arg, &flp);
if (error) if (error || arg == F_UNLCK)
goto out_unlock; goto out_unlock;
error = fasync_helper(fd, filp, 1, &flp->fl_fasync); error = fasync_helper(fd, filp, 1, &flp->fl_fasync);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment