Module Name: src
Committed By: maxv
Date: Tue Mar 3 17:56:51 UTC 2015
Modified Files:
src/sys/ufs/ffs: ffs_vfsops.c
Log Message:
ffs_reload(): release 'bp' earlier
To generate a diff of this commit:
cvs rdiff -u -r1.320 -r1.321 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.320 src/sys/ufs/ffs/ffs_vfsops.c:1.321
--- src/sys/ufs/ffs/ffs_vfsops.c:1.320 Tue Mar 3 17:46:39 2015
+++ src/sys/ufs/ffs/ffs_vfsops.c Tue Mar 3 17:56:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.320 2015/03/03 17:46:39 maxv Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.321 2015/03/03 17:56:51 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.320 2015/03/03 17:46:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.321 2015/03/03 17:56:51 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -733,14 +733,14 @@ ffs_reload(struct mount *mp, kauth_cred_
#endif
fs->fs_flags &= ~FS_SWAPPED;
+ brelse(bp, 0);
+
if ((newfs->fs_magic != FS_UFS1_MAGIC &&
newfs->fs_magic != FS_UFS2_MAGIC)) {
- brelse(bp, 0);
kmem_free(newfs, fs_sbsize);
return (EIO); /* XXX needs translation */
}
if (!ffs_superblock_validate(newfs)) {
- brelse(bp, 0);
kmem_free(newfs, fs_sbsize);
return (EINVAL);
}
@@ -753,7 +753,6 @@ ffs_reload(struct mount *mp, kauth_cred_
(newfs->fs_cssize != fs->fs_cssize) ||
(newfs->fs_contigsumsize != fs->fs_contigsumsize) ||
(newfs->fs_ncg != fs->fs_ncg)) {
- brelse(bp, 0);
kmem_free(newfs, fs_sbsize);
return (EINVAL);
}
@@ -772,7 +771,6 @@ ffs_reload(struct mount *mp, kauth_cred_
newfs->fs_ronly = fs->fs_ronly;
newfs->fs_active = fs->fs_active;
memcpy(fs, newfs, (u_int)fs_sbsize);
- brelse(bp, 0);
kmem_free(newfs, fs_sbsize);
/* Recheck for apple UFS filesystem */
