Module Name: src
Committed By: hannken
Date: Sun Oct 16 12:41:46 UTC 2011
Modified Files:
src/sys/fs/nilfs: nilfs_vnops.c
Log Message:
VOP_GETATTR() needs a shared lock at least.
While here fix a typo (fvp -> tvp).
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/fs/nilfs/nilfs_vnops.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/fs/nilfs/nilfs_vnops.c
diff -u src/sys/fs/nilfs/nilfs_vnops.c:1.14 src/sys/fs/nilfs/nilfs_vnops.c:1.15
--- src/sys/fs/nilfs/nilfs_vnops.c:1.14 Tue Sep 27 01:34:41 2011
+++ src/sys/fs/nilfs/nilfs_vnops.c Sun Oct 16 12:41:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_vnops.c,v 1.14 2011/09/27 01:34:41 christos Exp $ */
+/* $NetBSD: nilfs_vnops.c,v 1.15 2011/10/16 12:41:45 hannken Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.14 2011/09/27 01:34:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.15 2011/10/16 12:41:45 hannken Exp $");
#endif /* not lint */
@@ -1330,13 +1330,15 @@ nilfs_rename(void *v)
}
/* get info about the node to be moved */
+ vn_lock(fvp, LK_SHARED | LK_RETRY);
error = VOP_GETATTR(fvp, &fvap, FSCRED);
+ VOP_UNLOCK(fvp);
KASSERT(error == 0);
/* check when to delete the old already existing entry */
if (tvp) {
/* get info about the node to be moved to */
- error = VOP_GETATTR(fvp, &tvap, FSCRED);
+ error = VOP_GETATTR(tvp, &tvap, FSCRED);
KASSERT(error == 0);
/* if both dirs, make sure the destination is empty */
