From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Eric W. Biederman" Subject: [PATCH 14/23] vfs: Teach flock to use file_hotplug_lock Date: Mon, 1 Jun 2009 14:50:39 -0700 Message-ID: <1243893048-17031-14-git-send-email-ebiederm@xmission.com> References: Cc: , , , , Hugh Dickins , Tejun Heo , Alexey Dobriyan , Linus Torvalds , Alan Cox , Greg Kroah-Hartman , Nick Piggin , Andrew Morton , Christoph Hellwig , "Eric W. Biederman" , "Eric W. Biederman" To: Al Viro Return-path: Received: from out01.mta.xmission.com ([166.70.13.231]:43411 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754502AbZFAVvA (ORCPT ); Mon, 1 Jun 2009 17:51:00 -0400 In-Reply-To: Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Eric W. Biederman Signed-off-by: Eric W. Biederman --- fs/locks.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index ec3deea..f74794e 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1584,9 +1584,13 @@ SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd) !(filp->f_mode & (FMODE_READ|FMODE_WRITE))) goto out_putf; + error = -EIO; + if (!file_hotplug_read_trylock(filp)) + goto out_putf; + error = flock_make_lock(filp, &lock, cmd); if (error) - goto out_putf; + goto out_unlock; if (can_sleep) lock->fl_flags |= FL_SLEEP; @@ -1604,6 +1608,8 @@ SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd) out_free: locks_free_lock(lock); + out_unlock: + file_hotplug_read_unlock(filp); out_putf: fput(filp); out: -- 1.6.3.1.54.g99dd.dirty