Fix double close of journal file descriptor Index: libfs/logform.c =================================================================== RCS file: /cvsroot/jfs/jfsutils/libfs/logform.c,v retrieving revision 1.19 diff -u -p -r1.19 logform.c --- libfs/logform.c 22 Nov 2005 20:43:55 -0000 1.19 +++ libfs/logform.c 20 Mar 2007 14:08:51 -0000 @@ -289,10 +289,7 @@ int jfs_logform(FILE *fp, /* this is a } } - if (!inlinelog) { - ujfs_flush_dev(fp); - fclose(fp); - } + ujfs_flush_dev(fp); return (0); Index: mkfs/mkfs.c =================================================================== RCS file: /cvsroot/jfs/jfsutils/mkfs/mkfs.c,v retrieving revision 1.45 diff -u -p -r1.45 mkfs.c --- mkfs/mkfs.c 5 Jun 2006 19:31:41 -0000 1.45 +++ mkfs/mkfs.c 20 Mar 2007 14:08:51 -0000 @@ -1036,7 +1036,7 @@ format_journal: rc = ENOSPC; message_user(MSG_OSO_FORMAT_FAILED, NULL, 0, OSO_MSG); DBG_ERROR(("Internal error: Format failed rc=%x\n", rc)) - fclose(dev_handle); + fclose(dev_handle); return (rc); } @@ -1049,7 +1049,7 @@ format_journal: if (rc != 0) { message_user(MSG_OSO_FORMAT_FAILED, NULL, 0, OSO_MSG); DBG_ERROR(("Internal error: Format failed rc=%x\n", rc)) - fclose(dev_handle); + fclose(dev_handle); return (rc); } }