adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

leases: when unlocking, skip locking-related steps

Browse source 
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: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
David M. Richter 2008-04-23 16:29:00 -04:00 committed by J. Bruce Fields
parent 5fcc60c3a0
commit 288b2fd825
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
fs/locks.c
View file

@ -1367,18 +1367,20 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
lease = *flp; lease = *flp;
error = -EAGAIN; if (arg != F_UNLCK) {
if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) error = -EAGAIN;
goto out; if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0))
if ((arg == F_WRLCK) goto out;
&& ((atomic_read(&dentry->d_count) > 1) if ((arg == F_WRLCK)
|| (atomic_read(&inode->i_count) > 1))) && ((atomic_read(&dentry->d_count) > 1)
goto out; || (atomic_read(&inode->i_count) > 1)))
goto out;
error = -ENOMEM; error = -ENOMEM;
new_fl = locks_alloc_lock(); new_fl = locks_alloc_lock();
if (new_fl == NULL) if (new_fl == NULL)
goto out; goto out;
}
/* /*
* At this point, we know that if there is an exclusive * At this point, we know that if there is an exclusive