ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
/*
|
|
|
|
* util.c --- helper functions used by tune2fs and mke2fs
|
|
|
|
*
|
|
|
|
* Copyright 1995, 1996, 1997, 1998, 1999, 2000 by Theodore Ts'o.
|
|
|
|
*
|
|
|
|
* %Begin-Header%
|
|
|
|
* This file may be redistributed under the terms of the GNU Public
|
|
|
|
* License.
|
|
|
|
* %End-Header%
|
|
|
|
*/
|
|
|
|
|
2001-11-14 07:49:09 +08:00
|
|
|
#define _LARGEFILE_SOURCE
|
|
|
|
#define _LARGEFILE64_SOURCE
|
|
|
|
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#ifdef HAVE_ERRNO_H
|
|
|
|
#include <errno.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_LINUX_MAJOR_H
|
|
|
|
#include <linux/major.h>
|
2001-05-08 00:53:26 +08:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_STAT_H
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
#include <sys/stat.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "et/com_err.h"
|
|
|
|
#include "e2p/e2p.h"
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2image.c, findsuper.c, lsattr.c,
mke2fs.c, mklost+found.c, tune2fs.c, util.c: Change location of
ext2_fs.h to be ext2fs/ext2_fs.h
ChangeLog, Makefile.in, resize2fs.h:
resize2fs.h: Change location of ext2_fs.h to be ext2fs/ext2_fs.h
ChangeLog, Makefile.in, debugfs.h:
debugfs.h: Change location of ext2_fs.h to be ext2fs/ext2_fs.h
ChangeLog, Makefile.in, e2fsck.h, scantest.c:
e2fsck.h, scantest.c: Change location of ext2_fs.h to be
ext2fs/ext2_fs.h
ChangeLog, Makefile.in, tst_uuid.c, uuid_time.c:
tst_uuid.c, uuid_time.c: Remove unneeded #include of ext2_fs.h
ChangeLog, Makefile.in, e2p.h:
e2p.h: Change location of ext2_fs.h to be ext2fs/ext2_fs.h
ChangeLog, Makefile.in, test_icount.c, test_rel.c:
test_icount.c, test_rel.c: Change location of ext2_fs.h to be
ext2fs/ext2_fs.h
2001-05-14 19:45:38 +08:00
|
|
|
#include "ext2fs/ext2_fs.h"
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
#include "ext2fs/ext2fs.h"
|
|
|
|
#include "nls-enable.h"
|
2003-03-02 08:29:01 +08:00
|
|
|
#include "blkid/blkid.h"
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
#include "util.h"
|
|
|
|
|
|
|
|
#ifndef HAVE_STRCASECMP
|
|
|
|
int strcasecmp (char *s1, char *s2)
|
|
|
|
{
|
|
|
|
while (*s1 && *s2) {
|
|
|
|
int ch1 = *s1++, ch2 = *s2++;
|
|
|
|
if (isupper (ch1))
|
|
|
|
ch1 = tolower (ch1);
|
|
|
|
if (isupper (ch2))
|
|
|
|
ch2 = tolower (ch2);
|
|
|
|
if (ch1 != ch2)
|
|
|
|
return ch1 - ch2;
|
|
|
|
}
|
|
|
|
return *s1 ? 1 : *s2 ? -1 : 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2002-02-26 14:11:26 +08:00
|
|
|
/*
|
|
|
|
* Given argv[0], return the program name.
|
|
|
|
*/
|
|
|
|
char *get_progname(char *argv_zero)
|
|
|
|
{
|
|
|
|
char *cp;
|
|
|
|
|
|
|
|
cp = strrchr(argv_zero, '/');
|
|
|
|
if (!cp )
|
|
|
|
return argv_zero;
|
|
|
|
else
|
|
|
|
return cp+1;
|
|
|
|
}
|
|
|
|
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
void proceed_question(void)
|
|
|
|
{
|
|
|
|
char buf[256];
|
ChangeLog, e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c:
e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c: Fix
gcc -Wall complaints, including one bug in tune2fs caused by a block
automatic shadowing version of the variable we really wanted to use,
which broke the logic testing to see if the filesystem was mounted.
ChangeLog, MCONFIG.in:
(gcc-wall-new): Added new target which forgoes the make clean so we
only check the newly modified .c files.
2001-01-12 00:08:23 +08:00
|
|
|
const char *short_yes = _("yY");
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
|
|
|
|
fflush(stdout);
|
|
|
|
fflush(stderr);
|
|
|
|
printf(_("Proceed anyway? (y,n) "));
|
|
|
|
buf[0] = 0;
|
|
|
|
fgets(buf, sizeof(buf), stdin);
|
|
|
|
if (strchr(short_yes, buf[0]) == 0)
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
void check_plausibility(const char *device)
|
|
|
|
{
|
|
|
|
int val;
|
2001-11-14 07:49:09 +08:00
|
|
|
#ifdef HAVE_OPEN64
|
|
|
|
struct stat64 s;
|
|
|
|
|
|
|
|
val = stat64(device, &s);
|
|
|
|
#else
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
struct stat s;
|
|
|
|
|
|
|
|
val = stat(device, &s);
|
2001-11-14 07:49:09 +08:00
|
|
|
#endif
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
|
|
|
|
if(val == -1) {
|
|
|
|
fprintf(stderr, _("Could not stat %s --- %s\n"),
|
|
|
|
device, error_message(errno));
|
|
|
|
if (errno == ENOENT)
|
|
|
|
fprintf(stderr, _("\nThe device apparently does "
|
|
|
|
"not exist; did you specify it correctly?\n"));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (!S_ISBLK(s.st_mode)) {
|
|
|
|
printf(_("%s is not a block special device.\n"), device);
|
|
|
|
proceed_question();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef HAVE_LINUX_MAJOR_H
|
|
|
|
#ifndef MAJOR
|
|
|
|
#define MAJOR(dev) ((dev)>>8)
|
|
|
|
#define MINOR(dev) ((dev) & 0xff)
|
|
|
|
#endif
|
|
|
|
#ifndef SCSI_BLK_MAJOR
|
2003-11-21 07:34:20 +08:00
|
|
|
#ifdef SCSI_DISK0_MAJOR
|
|
|
|
#ifdef SCSI_DISK8_MAJOR
|
|
|
|
#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
|
|
|
|
((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR) || \
|
|
|
|
((M) >= SCSI_DISK8_MAJOR && (M) <= SCSI_DISK15_MAJOR))
|
|
|
|
#else
|
|
|
|
#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
|
|
|
|
((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR))
|
|
|
|
#endif /* defined(SCSI_DISK8_MAJOR) */
|
|
|
|
#define SCSI_BLK_MAJOR(M) (SCSI_DISK_MAJOR((M)) || (M) == SCSI_CDROM_MAJOR)
|
|
|
|
#else
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
#define SCSI_BLK_MAJOR(M) ((M) == SCSI_DISK_MAJOR || (M) == SCSI_CDROM_MAJOR)
|
2003-11-21 07:34:20 +08:00
|
|
|
#endif /* defined(SCSI_DISK0_MAJOR) */
|
|
|
|
#endif /* defined(SCSI_BLK_MAJOR) */
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
if (((MAJOR(s.st_rdev) == HD_MAJOR &&
|
|
|
|
MINOR(s.st_rdev)%64 == 0) ||
|
|
|
|
(SCSI_BLK_MAJOR(MAJOR(s.st_rdev)) &&
|
|
|
|
MINOR(s.st_rdev)%16 == 0))) {
|
|
|
|
printf(_("%s is entire device, not just one partition!\n"),
|
|
|
|
device);
|
|
|
|
proceed_question();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void check_mount(const char *device, int force, const char *type)
|
|
|
|
{
|
|
|
|
errcode_t retval;
|
|
|
|
int mount_flags;
|
|
|
|
|
|
|
|
retval = ext2fs_check_if_mounted(device, &mount_flags);
|
|
|
|
if (retval) {
|
|
|
|
com_err("ext2fs_check_if_mount", retval,
|
|
|
|
_("while determining whether %s is mounted."),
|
|
|
|
device);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!(mount_flags & EXT2_MF_MOUNTED))
|
|
|
|
return;
|
|
|
|
|
|
|
|
fprintf(stderr, _("%s is mounted; "), device);
|
|
|
|
if (force) {
|
|
|
|
fprintf(stderr, _("mke2fs forced anyway. "
|
|
|
|
"Hope /etc/mtab is incorrect.\n"));
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, _("will not make a %s here!\n"), type);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void parse_journal_opts(const char *opts)
|
|
|
|
{
|
|
|
|
char *buf, *token, *next, *p, *arg;
|
|
|
|
int len;
|
|
|
|
int journal_usage = 0;
|
|
|
|
|
|
|
|
len = strlen(opts);
|
|
|
|
buf = malloc(len+1);
|
|
|
|
if (!buf) {
|
|
|
|
fprintf(stderr, _("Couldn't allocate memory to parse "
|
|
|
|
"journal options!\n"));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
strcpy(buf, opts);
|
|
|
|
for (token = buf; token && *token; token = next) {
|
|
|
|
p = strchr(token, ',');
|
|
|
|
next = 0;
|
|
|
|
if (p) {
|
|
|
|
*p = 0;
|
|
|
|
next = p+1;
|
|
|
|
}
|
|
|
|
arg = strchr(token, '=');
|
|
|
|
if (arg) {
|
|
|
|
*arg = 0;
|
|
|
|
arg++;
|
|
|
|
}
|
|
|
|
#if 0
|
|
|
|
printf("Journal option=%s, argument=%s\n", token,
|
|
|
|
arg ? arg : "NONE");
|
|
|
|
#endif
|
|
|
|
if (strcmp(token, "device") == 0) {
|
2003-03-02 08:29:01 +08:00
|
|
|
journal_device = blkid_get_devname(NULL, arg, NULL);
|
2001-08-17 17:48:11 +08:00
|
|
|
if (!journal_device) {
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
journal_usage++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
} else if (strcmp(token, "size") == 0) {
|
|
|
|
if (!arg) {
|
|
|
|
journal_usage++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
journal_size = strtoul(arg, &p, 0);
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
ke2fs.8.in, tune2fs.8.in: Change man paegs to document that the
journal must be bewteen 1024 and 10,240 file system blocks.
mke2fs.c, tune2fs.c: Change to use figure_journal_size()
util.c, util.h (figure_journal_size): Change journal_default_size into
routine which also converts the requested journal size into filesystem
blocks and does bounds checking to make sure the journal is sized
reasonably. Renamed function to journal_default_size.
parse_journal_opts): Remove bounds check for the journal size, since
this is now done in figure_journal_size, and based on the number of
filesystem blocks, as opposed to using the absolute size of the
journal.
2001-03-27 04:07:13 +08:00
|
|
|
if (*p)
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
journal_usage++;
|
|
|
|
} else if (strcmp(token, "v1_superblock") == 0) {
|
|
|
|
journal_flags |= EXT2_MKJOURNAL_V1_SUPER;
|
|
|
|
continue;
|
2001-04-17 10:34:41 +08:00
|
|
|
} else
|
|
|
|
journal_usage++;
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
}
|
|
|
|
if (journal_usage) {
|
|
|
|
fprintf(stderr, _("\nBad journal options specified.\n\n"
|
|
|
|
"Journal options are separated by commas, "
|
|
|
|
"and may take an argument which\n"
|
|
|
|
"\tis set off by an equals ('=') sign.\n\n"
|
2003-05-04 06:45:55 +08:00
|
|
|
"Valid journal options are:\n"
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
"\tsize=<journal size in megabytes>\n"
|
|
|
|
"\tdevice=<journal device>\n\n"
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
ke2fs.8.in, tune2fs.8.in: Change man paegs to document that the
journal must be bewteen 1024 and 10,240 file system blocks.
mke2fs.c, tune2fs.c: Change to use figure_journal_size()
util.c, util.h (figure_journal_size): Change journal_default_size into
routine which also converts the requested journal size into filesystem
blocks and does bounds checking to make sure the journal is sized
reasonably. Renamed function to journal_default_size.
parse_journal_opts): Remove bounds check for the journal size, since
this is now done in figure_journal_size, and based on the number of
filesystem blocks, as opposed to using the absolute size of the
journal.
2001-03-27 04:07:13 +08:00
|
|
|
"The journal size must be between "
|
|
|
|
"1024 and 102400 filesystem blocks.\n\n" ));
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-01-18 09:47:48 +08:00
|
|
|
/*
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
ke2fs.8.in, tune2fs.8.in: Change man paegs to document that the
journal must be bewteen 1024 and 10,240 file system blocks.
mke2fs.c, tune2fs.c: Change to use figure_journal_size()
util.c, util.h (figure_journal_size): Change journal_default_size into
routine which also converts the requested journal size into filesystem
blocks and does bounds checking to make sure the journal is sized
reasonably. Renamed function to journal_default_size.
parse_journal_opts): Remove bounds check for the journal size, since
this is now done in figure_journal_size, and based on the number of
filesystem blocks, as opposed to using the absolute size of the
journal.
2001-03-27 04:07:13 +08:00
|
|
|
* Determine the number of journal blocks to use, either via
|
|
|
|
* user-specified # of megabytes, or via some intelligently selected
|
|
|
|
* defaults.
|
|
|
|
*
|
2001-01-18 09:47:48 +08:00
|
|
|
* Find a reasonable journal file size (in blocks) given the number of blocks
|
|
|
|
* in the filesystem. For very small filesystems, it is not reasonable to
|
|
|
|
* have a journal that fills more than half of the filesystem.
|
|
|
|
*/
|
2001-12-17 12:23:37 +08:00
|
|
|
int figure_journal_size(int size, ext2_filsys fs)
|
2001-01-18 09:47:48 +08:00
|
|
|
{
|
|
|
|
blk_t j_blocks;
|
|
|
|
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
ke2fs.8.in, tune2fs.8.in: Change man paegs to document that the
journal must be bewteen 1024 and 10,240 file system blocks.
mke2fs.c, tune2fs.c: Change to use figure_journal_size()
util.c, util.h (figure_journal_size): Change journal_default_size into
routine which also converts the requested journal size into filesystem
blocks and does bounds checking to make sure the journal is sized
reasonably. Renamed function to journal_default_size.
parse_journal_opts): Remove bounds check for the journal size, since
this is now done in figure_journal_size, and based on the number of
filesystem blocks, as opposed to using the absolute size of the
journal.
2001-03-27 04:07:13 +08:00
|
|
|
if (fs->super->s_blocks_count < 2048) {
|
|
|
|
fprintf(stderr, _("\nFilesystem too small for a journal\n"));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-12-17 12:23:37 +08:00
|
|
|
if (size >= 0) {
|
|
|
|
j_blocks = size * 1024 / (fs->blocksize / 1024);
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
ke2fs.8.in, tune2fs.8.in: Change man paegs to document that the
journal must be bewteen 1024 and 10,240 file system blocks.
mke2fs.c, tune2fs.c: Change to use figure_journal_size()
util.c, util.h (figure_journal_size): Change journal_default_size into
routine which also converts the requested journal size into filesystem
blocks and does bounds checking to make sure the journal is sized
reasonably. Renamed function to journal_default_size.
parse_journal_opts): Remove bounds check for the journal size, since
this is now done in figure_journal_size, and based on the number of
filesystem blocks, as opposed to using the absolute size of the
journal.
2001-03-27 04:07:13 +08:00
|
|
|
if (j_blocks < 1024 || j_blocks > 102400) {
|
|
|
|
fprintf(stderr, _("\nThe requested journal "
|
|
|
|
"size is %d blocks; it must be\n"
|
|
|
|
"between 1024 and 102400 blocks. "
|
|
|
|
"Aborting.\n"),
|
|
|
|
j_blocks);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (j_blocks > fs->super->s_free_blocks_count) {
|
|
|
|
fprintf(stderr, _("\nJournal size too big "
|
|
|
|
"for filesystem.\n"));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
return j_blocks;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fs->super->s_blocks_count < 32768)
|
2001-01-18 09:47:48 +08:00
|
|
|
j_blocks = 1024;
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
ke2fs.8.in, tune2fs.8.in: Change man paegs to document that the
journal must be bewteen 1024 and 10,240 file system blocks.
mke2fs.c, tune2fs.c: Change to use figure_journal_size()
util.c, util.h (figure_journal_size): Change journal_default_size into
routine which also converts the requested journal size into filesystem
blocks and does bounds checking to make sure the journal is sized
reasonably. Renamed function to journal_default_size.
parse_journal_opts): Remove bounds check for the journal size, since
this is now done in figure_journal_size, and based on the number of
filesystem blocks, as opposed to using the absolute size of the
journal.
2001-03-27 04:07:13 +08:00
|
|
|
else if (fs->super->s_blocks_count < 262144)
|
2001-01-18 09:47:48 +08:00
|
|
|
j_blocks = 4096;
|
|
|
|
else
|
|
|
|
j_blocks = 8192;
|
|
|
|
|
|
|
|
return j_blocks;
|
|
|
|
}
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
ke2fs.8.in, tune2fs.8.in: Change man paegs to document that the
journal must be bewteen 1024 and 10,240 file system blocks.
mke2fs.c, tune2fs.c: Change to use figure_journal_size()
util.c, util.h (figure_journal_size): Change journal_default_size into
routine which also converts the requested journal size into filesystem
blocks and does bounds checking to make sure the journal is sized
reasonably. Renamed function to journal_default_size.
parse_journal_opts): Remove bounds check for the journal size, since
this is now done in figure_journal_size, and based on the number of
filesystem blocks, as opposed to using the absolute size of the
journal.
2001-03-27 04:07:13 +08:00
|
|
|
|
2001-06-14 14:42:44 +08:00
|
|
|
void print_check_message(ext2_filsys fs)
|
|
|
|
{
|
|
|
|
printf(_("This filesystem will be automatically "
|
|
|
|
"checked every %d mounts or\n"
|
|
|
|
"%g days, whichever comes first. "
|
|
|
|
"Use tune2fs -c or -i to override.\n"),
|
|
|
|
fs->super->s_max_mnt_count,
|
|
|
|
(double)fs->super->s_checkinterval / (3600 * 24));
|
|
|
|
}
|