Module Name: src
Committed By: jdolecek
Date: Wed Mar 22 21:31:00 UTC 2017
Modified Files:
src/sys/ufs/ffs: ffs_wapbl.c
Log Message:
move the ffs_sync() after wapbl_log_position() call, since that can still
create delayed writes with MNT_ASYNC when log is created
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 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.39 src/sys/ufs/ffs/ffs_wapbl.c:1.40
--- src/sys/ufs/ffs/ffs_wapbl.c:1.39 Thu Mar 16 22:09:19 2017
+++ src/sys/ufs/ffs/ffs_wapbl.c Wed Mar 22 21:30:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_wapbl.c,v 1.39 2017/03/16 22:09:19 jdolecek Exp $ */
+/* $NetBSD: ffs_wapbl.c,v 1.40 2017/03/22 21:30:59 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.39 2017/03/16 22:09:19 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.40 2017/03/22 21:30:59 jdolecek Exp $");
#define WAPBL_INTERNAL
@@ -338,6 +338,11 @@ ffs_wapbl_start(struct mount *mp)
return EINVAL;
}
+ error = wapbl_log_position(mp, fs, devvp, &off,
+ &count, &blksize, &extradata);
+ if (error)
+ return error;
+
/*
* Make sure we don't carry over any delayed write
* buffers when updating to log. Need to turn off
@@ -351,11 +356,6 @@ ffs_wapbl_start(struct mount *mp)
mp->mnt_flag |= saveflag;
}
- error = wapbl_log_position(mp, fs, devvp, &off,
- &count, &blksize, &extradata);
- if (error)
- return error;
-
error = wapbl_start(&mp->mnt_wapbl, mp, devvp, off,
count, blksize, mp->mnt_wapbl_replay,
ffs_wapbl_sync_metadata,
