Messages in this thread Patch in this message |  | | Date | Sat, 14 Sep 2002 12:18:11 +0200 | From | Petr Vandrovec <> | Subject | [PATCH] 2.5.34-bk fcntl lockup |
| |
Hi Linus, please apply this.
Fixes endless loop without schedule which happens as soon as smbd invokes fcntl64(7, F_SETLK64, ...). fcntl_setlk64 gets cmd F_SETLK64, not F_SETLK tested in the loop;
Maybe return value from posix_lock_file should be changed to -EINPROGRESS or -EJUKEBOX instead of testing passed cmd in callers, but this oneliner works too. If you preffer changing posix_lock_file return value to clearly distinugish between -EAGAIN and lock request queued, I'll do that. Best regards, Petr Vandrovec vandrove@vc.cvut.cz
diff -urdN linux/fs/locks.c linux/fs/locks.c --- linux/fs/locks.c 2002-09-13 21:49:17.000000000 +0200 +++ linux/fs/locks.c 2002-09-14 11:19:37.000000000 +0200 @@ -1588,7 +1588,7 @@ for (;;) { error = posix_lock_file(filp, file_lock); - if ((error != -EAGAIN) || (cmd == F_SETLK)) + if ((error != -EAGAIN) || (cmd == F_SETLK64)) break; error = wait_event_interruptible(file_lock->fl_wait, !file_lock->fl_next); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |