Module Name: src
Committed By: jdolecek
Date: Sat Sep 24 20:59:51 UTC 2016
Modified Files:
src/sys/ufs/ffs: ffs_wapbl.c
Log Message:
i/o optimization for wapbl flush - only sync superblock and cgs when
they were actually changed
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/ufs/ffs/ffs_wapbl.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/ffs/ffs_wapbl.c
diff -u src/sys/ufs/ffs/ffs_wapbl.c:1.30 src/sys/ufs/ffs/ffs_wapbl.c:1.31
--- src/sys/ufs/ffs/ffs_wapbl.c:1.30 Sat Mar 28 19:24:04 2015
+++ src/sys/ufs/ffs/ffs_wapbl.c Sat Sep 24 20:59:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_wapbl.c,v 1.30 2015/03/28 19:24:04 maxv Exp $ */
+/* $NetBSD: ffs_wapbl.c,v 1.31 2016/09/24 20:59:51 jdolecek Exp $ */
/*-
* Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.30 2015/03/28 19:24:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.31 2016/09/24 20:59:51 jdolecek Exp $");
#define WAPBL_INTERNAL
@@ -174,6 +174,8 @@ ffs_wapbl_sync_metadata(struct mount *mp
struct fs *fs = ump->um_fs;
int i, error __diagused;
+ UFS_WAPBL_JLOCK_ASSERT(mp);
+
#ifdef WAPBL_DEBUG_INODES
ufs_wapbl_verify_inodes(mp, "ffs_wapbl_sync_metadata");
#endif
@@ -187,10 +189,12 @@ ffs_wapbl_sync_metadata(struct mount *mp
FFS_DBTOFSB(fs, deallocblks[i]), dealloclens[i], -1);
}
- fs->fs_fmod = 0;
- fs->fs_time = time_second;
- error = ffs_cgupdate(ump, 0);
- KASSERT(error == 0);
+ if (fs->fs_fmod != 0) {
+ fs->fs_fmod = 0;
+ fs->fs_time = time_second;
+ error = ffs_cgupdate(ump, 0);
+ KASSERT(error != 0);
+ }
}
void
