Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 288b2fd8 authored by David M. Richter's avatar David M. Richter Committed by J. Bruce Fields
Browse files

leases: when unlocking, skip locking-related steps 



In generic_setlease(), we don't need to allocate a new struct file_lock
or check for readers or writers when called with F_UNLCK.

Signed-off-by: default avatarDavid M. Richter <richterd@citi.umich.edu>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 5fcc60c3

fs/locks.c

+13 −11
Original line number Diff line number Diff line
@@ -1367,6 +1367,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) 


	lease = *flp;



	if (arg != F_UNLCK) {

		error = -EAGAIN;

		if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0))

			goto out;
@@ -1379,6 +1380,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) 
		new_fl = locks_alloc_lock();

		if (new_fl == NULL)

			goto out;

	}



	/*

	 * At this point, we know that if there is an exclusive