[PATCH] flock_lock_file livelock fix

Looks like I dropped a hunk from my patchset, sorry.

We never set FL_SLEEP in the flock case, so if we should block, we'll
livelock instead.

diff --git a/fs/locks.c b/fs/locks.c
index a52afbf2a1da3011038936ccf853472c0d6900f3..3702820a3de1eb50908216a9aeb6e1aba797f5d5 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -253,7 +253,7 @@ static int flock_make_lock(struct file *filp,
 
        fl->fl_file = filp;
        fl->fl_pid = current->pid;
-       fl->fl_flags = FL_FLOCK;
+       fl->fl_flags = (cmd & LOCK_NB) ? FL_FLOCK : FL_FLOCK | FL_SLEEP;
        fl->fl_type = type;
        fl->fl_end = OFFSET_MAX;