aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDavid M. Richter <richterd@citi.umich.edu>2008-04-23 16:29:00 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-04-25 12:58:22 -0400
commit288b2fd8251cb0bcb14b8a93755ef9c78de70e0f (patch)
tree65ab67c528ad063f8e2103e1bb916bcb6981bd66 /fs
parent5fcc60c3a05bf417229fba715e7aec52bf6717fb (diff)
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: David M. Richter <richterd@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/locks.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/fs/locks.c b/fs/locks.c
index b9f3a0bed30..da1d0ddb4ab 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1367,18 +1367,20 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
lease = *flp;
- error = -EAGAIN;
- if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0))
- goto out;
- if ((arg == F_WRLCK)
- && ((atomic_read(&dentry->d_count) > 1)
- || (atomic_read(&inode->i_count) > 1)))
- goto out;
+ if (arg != F_UNLCK) {
+ error = -EAGAIN;
+ if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0))
+ goto out;
+ if ((arg == F_WRLCK)
+ && ((atomic_read(&dentry->d_count) > 1)
+ || (atomic_read(&inode->i_count) > 1)))
+ goto out;
- error = -ENOMEM;
- new_fl = locks_alloc_lock();
- if (new_fl == NULL)
- goto out;
+ error = -ENOMEM;
+ new_fl = locks_alloc_lock();
+ if (new_fl == NULL)
+ goto out;
+ }
/*
* At this point, we know that if there is an exclusive