42c42
< __FBSDID("$FreeBSD: head/sbin/fsck_ffs/main.c 141611 2005-02-10 09:19:34Z ru $");
---
> __FBSDID("$FreeBSD: head/sbin/fsck_ffs/main.c 163845 2006-10-31 22:06:56Z pjd $");
239a240,262
> if (preen && skipclean) {
> /*
> * If file system is gjournaled, check it here.
> */
> if ((fsreadfd = open(filesys, O_RDONLY)) < 0 || readsb(0) == 0)
> exit(3); /* Cannot read superblock */
> close(fsreadfd);
> if ((sblock.fs_flags & FS_GJOURNAL) != 0) {
> //printf("GJournaled file system detected on %s.\n",
> // filesys);
> if (sblock.fs_clean == 1) {
> pwarn("FILE SYSTEM CLEAN; SKIPPING CHECKS\n");
> exit(0);
> }
> if ((sblock.fs_flags & (FS_UNCLEAN | FS_NEEDSFSCK)) == 0) {
> gjournal_check(filesys);
> exit(0);
> } else {
> pfatal("UNEXPECTED INCONSISTENCY, %s\n",
> "CANNOT RUN FAST FSCK\n");
> }
> }
> }
440c463
< bwrite(fswritefd, (char *)&sblock,
---
> blwrite(fswritefd, (char *)&sblock,
< __FBSDID("$FreeBSD: head/sbin/fsck_ffs/main.c 141611 2005-02-10 09:19:34Z ru $");
---
> __FBSDID("$FreeBSD: head/sbin/fsck_ffs/main.c 163845 2006-10-31 22:06:56Z pjd $");
239a240,262
> if (preen && skipclean) {
> /*
> * If file system is gjournaled, check it here.
> */
> if ((fsreadfd = open(filesys, O_RDONLY)) < 0 || readsb(0) == 0)
> exit(3); /* Cannot read superblock */
> close(fsreadfd);
> if ((sblock.fs_flags & FS_GJOURNAL) != 0) {
> //printf("GJournaled file system detected on %s.\n",
> // filesys);
> if (sblock.fs_clean == 1) {
> pwarn("FILE SYSTEM CLEAN; SKIPPING CHECKS\n");
> exit(0);
> }
> if ((sblock.fs_flags & (FS_UNCLEAN | FS_NEEDSFSCK)) == 0) {
> gjournal_check(filesys);
> exit(0);
> } else {
> pfatal("UNEXPECTED INCONSISTENCY, %s\n",
> "CANNOT RUN FAST FSCK\n");
> }
> }
> }
440c463
< bwrite(fswritefd, (char *)&sblock,
---
> blwrite(fswritefd, (char *)&sblock,