diff options
Diffstat (limited to 'e2fsprogs/ext2fs/mkjournal.c')
-rw-r--r-- | e2fsprogs/ext2fs/mkjournal.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/e2fsprogs/ext2fs/mkjournal.c b/e2fsprogs/ext2fs/mkjournal.c index b748918b6..0a9ae7a4d 100644 --- a/e2fsprogs/ext2fs/mkjournal.c +++ b/e2fsprogs/ext2fs/mkjournal.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * mkjournal.c --- make a journal for a filesystem | 2 | * mkjournal.c --- make a journal for a filesystem |
3 | * | 3 | * |
4 | * Copyright (C) 2000 Theodore Ts'o. | 4 | * Copyright (C) 2000 Theodore Ts'o. |
5 | * | 5 | * |
6 | * %Begin-Header% | 6 | * %Begin-Header% |
7 | * This file may be redistributed under the terms of the GNU Public | 7 | * This file may be redistributed under the terms of the GNU Public |
8 | * License. | 8 | * License. |
@@ -155,7 +155,7 @@ static int mkjournal_proc(ext2_filsys fs, | |||
155 | blk_t new_blk; | 155 | blk_t new_blk; |
156 | static blk_t last_blk = 0; | 156 | static blk_t last_blk = 0; |
157 | errcode_t retval; | 157 | errcode_t retval; |
158 | 158 | ||
159 | if (*blocknr) { | 159 | if (*blocknr) { |
160 | last_blk = *blocknr; | 160 | last_blk = *blocknr; |
161 | return 0; | 161 | return 0; |
@@ -186,7 +186,7 @@ static int mkjournal_proc(ext2_filsys fs, | |||
186 | return (BLOCK_CHANGED | BLOCK_ABORT); | 186 | return (BLOCK_CHANGED | BLOCK_ABORT); |
187 | else | 187 | else |
188 | return BLOCK_CHANGED; | 188 | return BLOCK_CHANGED; |
189 | 189 | ||
190 | } | 190 | } |
191 | 191 | ||
192 | /* | 192 | /* |
@@ -202,7 +202,7 @@ static errcode_t write_journal_inode(ext2_filsys fs, ext2_ino_t journal_ino, | |||
202 | 202 | ||
203 | if ((retval = ext2fs_create_journal_superblock(fs, size, flags, &buf))) | 203 | if ((retval = ext2fs_create_journal_superblock(fs, size, flags, &buf))) |
204 | return retval; | 204 | return retval; |
205 | 205 | ||
206 | if ((retval = ext2fs_read_bitmaps(fs))) | 206 | if ((retval = ext2fs_read_bitmaps(fs))) |
207 | return retval; | 207 | return retval; |
208 | 208 | ||
@@ -227,7 +227,7 @@ static errcode_t write_journal_inode(ext2_filsys fs, ext2_ino_t journal_ino, | |||
227 | if ((retval = ext2fs_read_inode(fs, journal_ino, &inode))) | 227 | if ((retval = ext2fs_read_inode(fs, journal_ino, &inode))) |
228 | goto errout; | 228 | goto errout; |
229 | 229 | ||
230 | inode.i_size += fs->blocksize * size; | 230 | inode.i_size += fs->blocksize * size; |
231 | inode.i_blocks += (fs->blocksize / 512) * es.newblocks; | 231 | inode.i_blocks += (fs->blocksize / 512) * es.newblocks; |
232 | inode.i_mtime = inode.i_ctime = time(0); | 232 | inode.i_mtime = inode.i_ctime = time(0); |
233 | inode.i_links_count = 1; | 233 | inode.i_links_count = 1; |
@@ -262,7 +262,7 @@ errcode_t ext2fs_add_journal_device(ext2_filsys fs, ext2_filsys journal_dev) | |||
262 | /* Make sure the device exists and is a block device */ | 262 | /* Make sure the device exists and is a block device */ |
263 | if (stat(journal_dev->device_name, &st) < 0) | 263 | if (stat(journal_dev->device_name, &st) < 0) |
264 | return errno; | 264 | return errno; |
265 | 265 | ||
266 | if (!S_ISBLK(st.st_mode)) | 266 | if (!S_ISBLK(st.st_mode)) |
267 | return EXT2_ET_JOURNAL_NOT_BLOCK; /* Must be a block device */ | 267 | return EXT2_ET_JOURNAL_NOT_BLOCK; /* Must be a block device */ |
268 | 268 | ||
@@ -297,7 +297,7 @@ errcode_t ext2fs_add_journal_device(ext2_filsys fs, ext2_filsys journal_dev) | |||
297 | /* Writeback the journal superblock */ | 297 | /* Writeback the journal superblock */ |
298 | if ((retval = io_channel_write_blk(journal_dev->io, start, -1024, buf))) | 298 | if ((retval = io_channel_write_blk(journal_dev->io, start, -1024, buf))) |
299 | return retval; | 299 | return retval; |
300 | 300 | ||
301 | fs->super->s_journal_inum = 0; | 301 | fs->super->s_journal_inum = 0; |
302 | fs->super->s_journal_dev = st.st_rdev; | 302 | fs->super->s_journal_dev = st.st_rdev; |
303 | memcpy(fs->super->s_journal_uuid, jsb->s_uuid, | 303 | memcpy(fs->super->s_journal_uuid, jsb->s_uuid, |
@@ -328,7 +328,7 @@ errcode_t ext2fs_add_journal_inode(ext2_filsys fs, blk_t size, int flags) | |||
328 | strcat(jfile, "/.journal"); | 328 | strcat(jfile, "/.journal"); |
329 | 329 | ||
330 | /* | 330 | /* |
331 | * If .../.journal already exists, make sure any | 331 | * If .../.journal already exists, make sure any |
332 | * immutable or append-only flags are cleared. | 332 | * immutable or append-only flags are cleared. |
333 | */ | 333 | */ |
334 | #if defined(HAVE_CHFLAGS) && defined(UF_NODUMP) | 334 | #if defined(HAVE_CHFLAGS) && defined(UF_NODUMP) |
@@ -350,7 +350,7 @@ errcode_t ext2fs_add_journal_inode(ext2_filsys fs, blk_t size, int flags) | |||
350 | 350 | ||
351 | if ((retval = write_journal_file(fs, jfile, size, flags))) | 351 | if ((retval = write_journal_file(fs, jfile, size, flags))) |
352 | goto errout; | 352 | goto errout; |
353 | 353 | ||
354 | /* Get inode number of the journal file */ | 354 | /* Get inode number of the journal file */ |
355 | if (fstat(fd, &st) < 0) | 355 | if (fstat(fd, &st) < 0) |
356 | goto errout; | 356 | goto errout; |
@@ -365,7 +365,7 @@ errcode_t ext2fs_add_journal_inode(ext2_filsys fs, blk_t size, int flags) | |||
365 | #endif | 365 | #endif |
366 | if (retval) | 366 | if (retval) |
367 | goto errout; | 367 | goto errout; |
368 | 368 | ||
369 | close(fd); | 369 | close(fd); |
370 | journal_ino = st.st_ino; | 370 | journal_ino = st.st_ino; |
371 | } else { | 371 | } else { |
@@ -374,7 +374,7 @@ errcode_t ext2fs_add_journal_inode(ext2_filsys fs, blk_t size, int flags) | |||
374 | size, flags))) | 374 | size, flags))) |
375 | return retval; | 375 | return retval; |
376 | } | 376 | } |
377 | 377 | ||
378 | fs->super->s_journal_inum = journal_ino; | 378 | fs->super->s_journal_inum = journal_ino; |
379 | fs->super->s_journal_dev = 0; | 379 | fs->super->s_journal_dev = 0; |
380 | memset(fs->super->s_journal_uuid, 0, | 380 | memset(fs->super->s_journal_uuid, 0, |
@@ -393,14 +393,14 @@ main(int argc, char **argv) | |||
393 | { | 393 | { |
394 | errcode_t retval; | 394 | errcode_t retval; |
395 | char *device_name; | 395 | char *device_name; |
396 | ext2_filsys fs; | 396 | ext2_filsys fs; |
397 | 397 | ||
398 | if (argc < 2) { | 398 | if (argc < 2) { |
399 | fprintf(stderr, "Usage: %s filesystem\n", argv[0]); | 399 | fprintf(stderr, "Usage: %s filesystem\n", argv[0]); |
400 | exit(1); | 400 | exit(1); |
401 | } | 401 | } |
402 | device_name = argv[1]; | 402 | device_name = argv[1]; |
403 | 403 | ||
404 | retval = ext2fs_open (device_name, EXT2_FLAG_RW, 0, 0, | 404 | retval = ext2fs_open (device_name, EXT2_FLAG_RW, 0, 0, |
405 | unix_io_manager, &fs); | 405 | unix_io_manager, &fs); |
406 | if (retval) { | 406 | if (retval) { |
@@ -420,6 +420,6 @@ main(int argc, char **argv) | |||
420 | } | 420 | } |
421 | ext2fs_close(fs); | 421 | ext2fs_close(fs); |
422 | exit(0); | 422 | exit(0); |
423 | 423 | ||
424 | } | 424 | } |
425 | #endif | 425 | #endif |