CVS commit: [netbsd-5] src/sys/ufs/ufs

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Sat Sep 17 18:51:34 UTC 2011

Modified Files:
        src/sys/ufs/ufs [netbsd-5]: ufs_extattr.c

Log Message:
Pull up following revision(s) (requested by manu in ticket #1664):
        sys/ufs/ufs/ufs_extattr.c: revision 1.35
Fix locking protocol to avoid a panic on extattrctl stop and on umount.


To generate a diff of this commit:
cvs rdiff -u -r1.21.14.3 -r1.21.14.4 src/sys/ufs/ufs/ufs_extattr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/ufs/ufs/ufs_extattr.c
diff -u src/sys/ufs/ufs/ufs_extattr.c:1.21.14.3 src/sys/ufs/ufs/ufs_extattr.c:1.21.14.4
--- src/sys/ufs/ufs/ufs_extattr.c:1.21.14.3	Sun Jul 17 15:36:04 2011
+++ src/sys/ufs/ufs/ufs_extattr.c	Sat Sep 17 18:51:34 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs_extattr.c,v 1.21.14.3 2011/07/17 15:36:04 riz Exp $	*/
+/*	$NetBSD: ufs_extattr.c,v 1.21.14.4 2011/09/17 18:51:34 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1999-2002 Robert N. M. Watson
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_extattr.c,v 1.21.14.3 2011/07/17 15:36:04 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_extattr.c,v 1.21.14.4 2011/09/17 18:51:34 bouyer Exp $");
 
 #include "opt_ffs.h"
 
@@ -130,6 +130,7 @@
 	if (ump->um_extattr.uepm_lockcnt != 0) {
 		KASSERT(mutex_owned(&ump->um_extattr.uepm_lock));
 		ump->um_extattr.uepm_lockcnt--;
+		return;
 	}
 	mutex_exit(&ump->um_extattr.uepm_lock);
 }