Commit 51ee4b84 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

locks: let the caller free file_lock on ->setlease failure 



The caller allocated it, the caller should free it.

The only issue so far is that we could change the flp pointer even on an
error return if the fl_change callback failed.  But we can simply move
the flp assignment after the fl_change invocation, as the callers don't
care about the flp return value if the setlease call failed.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 96f93593

fs/cifs/cifsfs.c

+1 −4
Original line number Diff line number Diff line
@@ -625,12 +625,9 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease) 
		   knows that the file won't be changed on the server

		   by anyone else */

		return generic_setlease(file, arg, lease);

	else {

		if (arg != F_UNLCK)

			locks_free_lock(*lease);

	else

		return -EAGAIN;

}

}



struct file_system_type cifs_fs_type = {

	.owner = THIS_MODULE,

fs/gfs2/file.c

+0 −2
Original line number Diff line number Diff line
@@ -629,8 +629,6 @@ static ssize_t gfs2_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 


static int gfs2_setlease(struct file *file, long arg, struct file_lock **fl)

{

	if (arg != F_UNLCK)

		locks_free_lock(*fl);

	return -EINVAL;

}

fs/locks.c

+11 −9
Original line number Diff line number Diff line
@@ -1428,8 +1428,9 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) 
		goto out;



	if (my_before != NULL) {

		*flp = *my_before;

		error = lease->fl_lmops->fl_change(my_before, arg);

		if (!error)

			*flp = *my_before;

		goto out;

	}
@@ -1444,8 +1445,6 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) 
	return 0;



out:

	if (arg != F_UNLCK)

		locks_free_lock(lease);

	return error;

}

EXPORT_SYMBOL(generic_setlease);
@@ -1524,8 +1523,11 @@ static int do_fcntl_add_lease(unsigned int fd, struct file *filp, long arg) 
	}

	lock_flocks();

	error = __vfs_setlease(filp, arg, &fl);

	if (error)

		goto out_unlock;

	if (error) {

		unlock_flocks();

		locks_free_lock(fl);

		goto out_free_fasync;

	}



	/*

	 * fasync_insert_entry() returns the old entry if any.
@@ -1541,12 +1543,12 @@ static int do_fcntl_add_lease(unsigned int fd, struct file *filp, long arg) 
		fl->fl_type = F_UNLCK | F_INPROGRESS;

		fl->fl_break_time = jiffies - 10;

		time_out_leases(inode);

		goto out_unlock;

	}



	} else {

		error = __f_setown(filp, task_pid(current), PIDTYPE_PID, 0);

out_unlock:

	}

	unlock_flocks();



out_free_fasync:

	if (new)

		fasync_free(new);

	return error;

fs/nfs/file.c

+0 −2
Original line number Diff line number Diff line
@@ -884,7 +884,5 @@ static int nfs_setlease(struct file *file, long arg, struct file_lock **fl) 
	dprintk("NFS: setlease(%s/%s, arg=%ld)\n",

			file->f_path.dentry->d_parent->d_name.name,

			file->f_path.dentry->d_name.name, arg);

	if (arg != F_UNLCK)

		locks_free_lock(*fl);

	return -EINVAL;

}

fs/nfsd/nfs4state.c

+1 −0
Original line number Diff line number Diff line
@@ -2652,6 +2652,7 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open, struct nfs4_sta 
	if ((status = vfs_setlease(fl->fl_file, fl->fl_type, &fl))) {

		dprintk("NFSD: setlease failed [%d], no delegation\n", status);

		dp->dl_flock = NULL;

		locks_free_lock(fl);

		unhash_delegation(dp);

		flag = NFS4_OPEN_DELEGATE_NONE;

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE