Module Name: src
Committed By: maxv
Date: Sat Feb 14 07:20:11 UTC 2015
Modified Files:
src/sys/ufs/ffs: ffs_vfsops.c
Log Message:
Style. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.310 -r1.311 src/sys/ufs/ffs/ffs_vfsops.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_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.310 src/sys/ufs/ffs/ffs_vfsops.c:1.311
--- src/sys/ufs/ffs/ffs_vfsops.c:1.310 Sat Feb 14 07:11:34 2015
+++ src/sys/ufs/ffs/ffs_vfsops.c Sat Feb 14 07:20:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.310 2015/02/14 07:11:34 maxv Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.311 2015/02/14 07:20:11 maxv 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.310 2015/02/14 07:11:34 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.311 2015/02/14 07:20:11 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -713,6 +713,7 @@ ffs_reload(struct mount *mp, kauth_cred_
return (EINVAL);
ump = VFSTOUFS(mp);
+
/*
* Step 1: invalidate all cached meta-data.
*/
@@ -722,19 +723,19 @@ ffs_reload(struct mount *mp, kauth_cred_
VOP_UNLOCK(devvp);
if (error)
panic("ffs_reload: dirty1");
+
/*
- * Step 2: re-read superblock from disk.
+ * Step 2: re-read superblock from disk. XXX: We don't handle
+ * possibility that superblock moved.
*/
fs = ump->um_fs;
-
- /* XXX we don't handle possibility that superblock moved. */
error = bread(devvp, fs->fs_sblockloc / DEV_BSIZE, fs->fs_sbsize,
NOCRED, 0, &bp);
- if (error) {
+ if (error)
return (error);
- }
newfs = kmem_alloc(fs->fs_sbsize, KM_SLEEP);
memcpy(newfs, bp->b_data, fs->fs_sbsize);
+
#ifdef FFS_EI
if (ump->um_flags & UFS_NEEDSWAP) {
ffs_sb_swap((struct fs*)bp->b_data, newfs);
