Re: Let's get rid of those annoying "VFS is out of sync with lock manager" messages (includes proposed patch)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 08/12/06, Neil Brown <[email protected]> wrote:
On Thursday December 7, [email protected] wrote:
>
> So I took Neils patch, made the change Trond suggested and the result is
> below.
>
> Comments?  Ok to merge?

Yes, except that you need a changelog comment at the top.  Possibly
based very heavily on the text I wrote, but written to justify the
patch rather than to explain the bug.

NeilBrown


How about this for a changelog entry?  :

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.


>
>
> Signed-off-by: Neil Brown <[email protected]>
> Signed-off-by: Jesper Juhl <[email protected]>
> ---
>
>  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 cc93865..22572af 100644
> --- a/fs/nfs/file.c
> +++ b/fs/nfs/file.c
> @@ -428,8 +428,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;
>  }
>
> @@ -479,10 +479,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();
>



--
Jesper Juhl <[email protected]>
Don't top-post  http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please      http://www.expita.com/nomime.html
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux