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
Subsystems (2)
PATCH 1/1 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.
---
fs/nfs/file.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
fs/nfs/file.c +7 -4
@@ -434,8 +434,8 @@ static int do_vfs_lock(struct file *fileBUG (); }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 ();
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs