From mboxrd@z Thu Jan 1 00:00:00 1970 From: "David M. Richter" Subject: [PATCH 3/4] leases: move lock allocation earlier in generic_setlease() Date: Wed, 23 Apr 2008 16:29:01 -0400 Message-ID: <1208982542-18277-3-git-send-email-richterd@citi.umich.edu> References: <1208982542-18277-1-git-send-email-richterd@citi.umich.edu> <1208982542-18277-2-git-send-email-richterd@citi.umich.edu> Cc: linux-fsdevel@vger.kernel.org, "David M. Richter" To: Bruce Fields Return-path: Received: from citi.umich.edu ([141.211.133.111]:40747 "EHLO citi.umich.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752833AbYDWU3F (ORCPT ); Wed, 23 Apr 2008 16:29:05 -0400 In-Reply-To: <1208982542-18277-2-git-send-email-richterd@citi.umich.edu> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: In generic_setlease(), the struct file_lock is allocated after tests for the presence of conflicting readers/writers is done, despite the fact that the allocation might block; this patch moves the allocation earlier. A subsequent set of patches will rely on this behavior to properly serialize between a modified __break_lease() and generic_setlease(). Signed-off-by: David M. Richter --- fs/locks.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index da1d0dd..6a132cd 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1368,6 +1368,11 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) lease = *flp; if (arg != F_UNLCK) { + error = -ENOMEM; + new_fl = locks_alloc_lock(); + if (new_fl == NULL) + goto out; + error = -EAGAIN; if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) goto out; @@ -1375,11 +1380,6 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) && ((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; } /* -- 1.5.4