From c82d74c208def821ed062f6302da9679a90d7cb9 Mon Sep 17 00:00:00 2001 From: "David M. Richter" Date: Wed, 23 Apr 2008 16:29:00 -0400 Subject: [PATCH] --- yaml --- r: 92967 b: refs/heads/master c: 288b2fd8251cb0bcb14b8a93755ef9c78de70e0f h: refs/heads/master i: 92965: bdb48f5bf0893d847a2935540f25d3a1659a4e13 92963: f610c56dc908de9d9b4558a3455ed1d826e7e46b 92959: e8b9fc78fdfc4b01104387b1e11fa7aa1ebc9799 v: v3 --- [refs] | 2 +- trunk/fs/locks.c | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 0596817d3dfe..015e1111ca8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fcc60c3a05bf417229fba715e7aec52bf6717fb +refs/heads/master: 288b2fd8251cb0bcb14b8a93755ef9c78de70e0f diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c index b9f3a0bed300..da1d0ddb4abd 100644 --- a/trunk/fs/locks.c +++ b/trunk/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