Source-Changes-HG archive

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

[src/trunk]: src/sys/ufs/ffs Fix a bug introduced with Rev. 1.294: use LK_NO...



details:   https://anonhg.NetBSD.org/src/rev/acbf47ebccfd
branches:  trunk
changeset: 820034:acbf47ebccfd
user:      hannken <hannken%NetBSD.org@localhost>
date:      Tue Dec 27 10:54:38 2016 +0000

description:
Fix a bug introduced with Rev. 1.294:  use LK_NOWAIT when called with MNT_LAZY.

diffstat:

 sys/ufs/ffs/ffs_vfsops.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 303c0d3a8c2c -r acbf47ebccfd sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Tue Dec 27 10:53:11 2016 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Tue Dec 27 10:54:38 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_vfsops.c,v 1.341 2016/10/20 19:31:32 jdolecek Exp $        */
+/*     $NetBSD: ffs_vfsops.c,v 1.342 2016/12/27 10:54:38 hannken Exp $ */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.341 2016/10/20 19:31:32 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.342 2016/12/27 10:54:38 hannken Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -1917,7 +1917,8 @@
        ctx.is_suspending = is_suspending;
        while ((vp = vfs_vnode_iterator_next(marker, ffs_sync_selector, &ctx)))
        {
-               error = vn_lock(vp, LK_EXCLUSIVE);
+               error = vn_lock(vp,
+                   LK_EXCLUSIVE | (waitfor == MNT_LAZY ? LK_NOWAIT : 0));
                if (error) {
                        vrele(vp);
                        continue;



Home | Main Index | Thread Index | Old Index