Deleted Added
full compact
growfs.c (261655) growfs.c (281929)
1/*
2 * Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
3 * Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
4 * Copyright (c) 2012 The FreeBSD Foundation
5 * All rights reserved.
6 *
7 * This code is derived from software contributed to Berkeley by
8 * Christoph Herrmann and Thomas-Henning von Kamptz, Munich and Frankfurt.

--- 37 unchanged lines hidden (view full) ---

46#ifndef lint
47static const char copyright[] =
48"@(#) Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz\n\
49Copyright (c) 1980, 1989, 1993 The Regents of the University of California.\n\
50All rights reserved.\n";
51#endif /* not lint */
52
53#include <sys/cdefs.h>
1/*
2 * Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
3 * Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
4 * Copyright (c) 2012 The FreeBSD Foundation
5 * All rights reserved.
6 *
7 * This code is derived from software contributed to Berkeley by
8 * Christoph Herrmann and Thomas-Henning von Kamptz, Munich and Frankfurt.

--- 37 unchanged lines hidden (view full) ---

46#ifndef lint
47static const char copyright[] =
48"@(#) Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz\n\
49Copyright (c) 1980, 1989, 1993 The Regents of the University of California.\n\
50All rights reserved.\n";
51#endif /* not lint */
52
53#include <sys/cdefs.h>
54__FBSDID("$FreeBSD: head/sbin/growfs/growfs.c 261655 2014-02-09 14:28:47Z brueffer $");
54__FBSDID("$FreeBSD: head/sbin/growfs/growfs.c 281929 2015-04-24 12:48:48Z trasz $");
55
56#include <sys/param.h>
57#include <sys/ioctl.h>
58#include <sys/stat.h>
59#include <sys/disk.h>
60#include <sys/ucred.h>
61#include <sys/mount.h>
62

--- 93 unchanged lines hidden (view full) ---

156 rdfs(fsbtodb(&osblock, osblock.fs_csaddr +
157 numfrags(&osblock, i)), (size_t)MIN(osblock.fs_cssize - i,
158 osblock.fs_bsize), (void *)(((char *)fscs) + i), fsi);
159 }
160
161#ifdef FS_DEBUG
162 {
163 struct csum *dbg_csp;
55
56#include <sys/param.h>
57#include <sys/ioctl.h>
58#include <sys/stat.h>
59#include <sys/disk.h>
60#include <sys/ucred.h>
61#include <sys/mount.h>
62

--- 93 unchanged lines hidden (view full) ---

156 rdfs(fsbtodb(&osblock, osblock.fs_csaddr +
157 numfrags(&osblock, i)), (size_t)MIN(osblock.fs_cssize - i,
158 osblock.fs_bsize), (void *)(((char *)fscs) + i), fsi);
159 }
160
161#ifdef FS_DEBUG
162 {
163 struct csum *dbg_csp;
164 int dbg_csc;
164 u_int32_t dbg_csc;
165 char dbg_line[80];
166
167 dbg_csp = fscs;
168
169 for (dbg_csc = 0; dbg_csc < osblock.fs_ncg; dbg_csc++) {
170 snprintf(dbg_line, sizeof(dbg_line),
171 "%d. old csum in old location", dbg_csc);
172 DBG_DUMP_CSUM(&osblock, dbg_line, dbg_csp++);

--- 64 unchanged lines hidden (view full) ---

237 (size_t)MIN(sblock.fs_cssize - i, sblock.fs_bsize),
238 (void *)(((char *)fscs) + i), fso, Nflag);
239 }
240 DBG_PRINT0("fscs written\n");
241
242#ifdef FS_DEBUG
243 {
244 struct csum *dbg_csp;
165 char dbg_line[80];
166
167 dbg_csp = fscs;
168
169 for (dbg_csc = 0; dbg_csc < osblock.fs_ncg; dbg_csc++) {
170 snprintf(dbg_line, sizeof(dbg_line),
171 "%d. old csum in old location", dbg_csc);
172 DBG_DUMP_CSUM(&osblock, dbg_line, dbg_csp++);

--- 64 unchanged lines hidden (view full) ---

237 (size_t)MIN(sblock.fs_cssize - i, sblock.fs_bsize),
238 (void *)(((char *)fscs) + i), fso, Nflag);
239 }
240 DBG_PRINT0("fscs written\n");
241
242#ifdef FS_DEBUG
243 {
244 struct csum *dbg_csp;
245 int dbg_csc;
245 u_int32_t dbg_csc;
246 char dbg_line[80];
247
248 dbg_csp = fscs;
249 for (dbg_csc = 0; dbg_csc < sblock.fs_ncg; dbg_csc++) {
250 snprintf(dbg_line, sizeof(dbg_line),
251 "%d. new csum in new location", dbg_csc);
252 DBG_DUMP_CSUM(&sblock, dbg_line, dbg_csp++);
253 }

--- 1489 unchanged lines hidden ---
246 char dbg_line[80];
247
248 dbg_csp = fscs;
249 for (dbg_csc = 0; dbg_csc < sblock.fs_ncg; dbg_csc++) {
250 snprintf(dbg_line, sizeof(dbg_line),
251 "%d. new csum in new location", dbg_csc);
252 DBG_DUMP_CSUM(&sblock, dbg_line, dbg_csp++);
253 }

--- 1489 unchanged lines hidden ---