Mon Aug 9 17:12:18 2010 UTC ()
add a linefeed to the previous


(pooka)
diff -r1.261 -r1.262 src/sys/ufs/ffs/ffs_vfsops.c

cvs diff -r1.261 -r1.262 src/sys/ufs/ffs/ffs_vfsops.c (expand / switch to unified diff)

--- src/sys/ufs/ffs/ffs_vfsops.c 2010/08/09 15:50:13 1.261
+++ src/sys/ufs/ffs/ffs_vfsops.c 2010/08/09 17:12:18 1.262
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ffs_vfsops.c,v 1.261 2010/08/09 15:50:13 pooka Exp $ */ 1/* $NetBSD: ffs_vfsops.c,v 1.262 2010/08/09 17:12:18 pooka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. 4 * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Wasabi Systems, Inc, and by Andrew Doran. 8 * by Wasabi Systems, Inc, and by Andrew Doran.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -51,27 +51,27 @@ @@ -51,27 +51,27 @@
51 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 51 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
52 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 52 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
53 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 53 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
54 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 54 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
55 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 55 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 * SUCH DAMAGE. 58 * SUCH DAMAGE.
59 * 59 *
60 * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 60 * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95
61 */ 61 */
62 62
63#include <sys/cdefs.h> 63#include <sys/cdefs.h>
64__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.261 2010/08/09 15:50:13 pooka Exp $"); 64__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.262 2010/08/09 17:12:18 pooka Exp $");
65 65
66#if defined(_KERNEL_OPT) 66#if defined(_KERNEL_OPT)
67#include "opt_ffs.h" 67#include "opt_ffs.h"
68#include "opt_quota.h" 68#include "opt_quota.h"
69#include "opt_wapbl.h" 69#include "opt_wapbl.h"
70#endif 70#endif
71 71
72#include <sys/param.h> 72#include <sys/param.h>
73#include <sys/systm.h> 73#include <sys/systm.h>
74#include <sys/namei.h> 74#include <sys/namei.h>
75#include <sys/proc.h> 75#include <sys/proc.h>
76#include <sys/kernel.h> 76#include <sys/kernel.h>
77#include <sys/vnode.h> 77#include <sys/vnode.h>
@@ -930,27 +930,27 @@ ffs_mountfs(struct vnode *devvp, struct  @@ -930,27 +930,27 @@ ffs_mountfs(struct vnode *devvp, struct
930#endif 930#endif
931 } 931 }
932 932
933 /* Check we haven't found an alternate superblock */ 933 /* Check we haven't found an alternate superblock */
934 if (fsblockloc != sblockloc) 934 if (fsblockloc != sblockloc)
935 continue; 935 continue;
936 936
937 /* Validate size of superblock */ 937 /* Validate size of superblock */
938 if (sbsize > MAXBSIZE || sbsize < sizeof(struct fs)) 938 if (sbsize > MAXBSIZE || sbsize < sizeof(struct fs))
939 continue; 939 continue;
940 940
941 /* Check that we can handle the file system blocksize */ 941 /* Check that we can handle the file system blocksize */
942 if (fsbsize > MAXBSIZE) { 942 if (fsbsize > MAXBSIZE) {
943 printf("ffs_mountfs: block size (%d) > MAXBSIZE (%d)", 943 printf("ffs_mountfs: block size (%d) > MAXBSIZE (%d)\n",
944 fsbsize, MAXBSIZE); 944 fsbsize, MAXBSIZE);
945 continue; 945 continue;
946 } 946 }
947 947
948 /* Ok seems to be a good superblock */ 948 /* Ok seems to be a good superblock */
949 break; 949 break;
950 } 950 }
951 951
952 fs = malloc((u_long)sbsize, M_UFSMNT, M_WAITOK); 952 fs = malloc((u_long)sbsize, M_UFSMNT, M_WAITOK);
953 memcpy(fs, bp->b_data, sbsize); 953 memcpy(fs, bp->b_data, sbsize);
954 ump->um_fs = fs; 954 ump->um_fs = fs;
955 955
956#ifdef FFS_EI 956#ifdef FFS_EI