lkml.org 
[lkml]   [2009]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subject[PATCH 14/23] vfs: Teach flock to use file_hotplug_lock
From: Eric W. Biederman <ebiederm@maxwell.arastra.com>

Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
---
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


\
 
 \ /
  Last update: 2009-06-02 00:01    [W:1.149 / U:38.860 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site