Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | From | Jesper Juhl <> | Date | Fri, 15 Dec 2006 14:50:52 +0100 | Subject | [PATCH] VFS: turn off FL_SLEEP when calling do_vfs_lock() just in case and get rid of "VFS is out of sync with lock manager" messages |
| |
Convert "VFS is out of sync with lock manager!" printk() in do_vfs_lock() to dprintk() since the message is useless in normal use but could possibly be useful as a debugging aid. Also turn off FL_SLEEP when calling do_vfs_lock() just in case, after getting -EINTR or -ERESTARTSYS.
Patch has been tested on a production webserver and works just fine.
Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> ---
fs/nfs/file.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 0dd6be3..4cf4166 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -434,8 +434,8 @@ static int do_vfs_lock(struct file *file BUG(); } if (res < 0) - printk(KERN_WARNING "%s: VFS is out of sync with lock manager!\n", - __FUNCTION__); + dprintk("%s: VFS is out of sync with lock manager (res = %d)!\n", + __FUNCTION__, res); return res; } @@ -485,10 +485,13 @@ static int do_setlk(struct file *filp, i * we clean up any state on the server. We therefore * record the lock call as having succeeded in order to * ensure that locks_remove_posix() cleans it out when - * the process exits. + * the process exits. Make sure not to sleep if + * someone else holds the lock. */ - if (status == -EINTR || status == -ERESTARTSYS) + if (status == -EINTR || status == -ERESTARTSYS) { + fl->fl_flags &= ~FL_SLEEP; do_vfs_lock(filp, fl); + } } else status = do_vfs_lock(filp, fl); unlock_kernel();
- 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/
| ![\](/images/icornerr.gif) |