* %End-Header%
*/
+#ifndef _LARGEFILE_SOURCE
#define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
#define _LARGEFILE64_SOURCE
+#endif
+
+#ifdef _WIN32
+#define _POSIX
+#define __USE_MINGW_ALARM
+#endif
#include "config.h"
#include <fcntl.h>
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#ifdef HAVE_LINUX_MAJOR_H
#include <linux/major.h>
#endif
#include "e2p/e2p.h"
#include "ext2fs/ext2_fs.h"
#include "ext2fs/ext2fs.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
+#include "support/devname.h"
#include "blkid/blkid.h"
#include "util.h"
static jmp_buf alarm_env;
-static void alarm_signal(int signal)
+static void alarm_signal(int signal EXT2FS_ATTR((unused)))
{
longjmp(alarm_env, 1);
}
{
char buf[256];
const char *short_yes = _("yY");
+ const char *english_yes = "yY";
fflush(stdout);
fflush(stderr);
return;
}
signal(SIGALRM, alarm_signal);
- printf(_("Proceed anyway (or wait %d seconds) ? (y,n) "),
+ printf(_("Proceed anyway (or wait %d seconds to proceed) ? (y,N) "),
delay);
alarm(delay);
} else
- fputs(_("Proceed anyway? (y,n) "), stdout);
+ fputs(_("Proceed anyway? (y,N) "), stdout);
buf[0] = 0;
if (!fgets(buf, sizeof(buf), stdin) ||
- strchr(short_yes, buf[0]) == 0) {
+ strchr(_("nN"), buf[0]) ||
+ !(strchr(short_yes, buf[0]) ||
+ strchr(english_yes, buf[0]))) {
putc('\n', stdout);
exit(1);
}
signal(SIGALRM, SIG_IGN);
}
-static void print_ext2_info(const char *device)
-
-{
- struct ext2_super_block *sb;
- ext2_filsys fs;
- errcode_t retval;
- time_t tm;
- char buf[80];
-
- retval = ext2fs_open2(device, 0, EXT2_FLAG_64BITS, 0, 0,
- unix_io_manager, &fs);
- if (retval)
- return;
- sb = fs->super;
-
- if (sb->s_mtime) {
- tm = sb->s_mtime;
- if (sb->s_last_mounted[0]) {
- memset(buf, 0, sizeof(buf));
- strncpy(buf, sb->s_last_mounted,
- sizeof(sb->s_last_mounted));
- printf(_("\tlast mounted on %s on %s"), buf,
- ctime(&tm));
- } else
- printf(_("\tlast mounted on %s"), ctime(&tm));
- } else if (sb->s_mkfs_time) {
- tm = sb->s_mkfs_time;
- printf(_("\tcreated on %s"), ctime(&tm));
- } else if (sb->s_wtime) {
- tm = sb->s_wtime;
- printf(_("\tlast modified on %s"), ctime(&tm));
- }
- ext2fs_close_free(&fs);
-}
-
-/*
- * return 1 if there is no partition table, 0 if a partition table is
- * detected, and -1 on an error.
- */
-static int check_partition_table(const char *device)
-{
-#ifdef HAVE_BLKID_PROBE_ENABLE_PARTITIONS
- blkid_probe pr;
- const char *value;
- int ret;
-
- pr = blkid_new_probe_from_filename(device);
- if (!pr)
- return -1;
-
- ret = blkid_probe_enable_partitions(pr, 1);
- if (ret < 0)
- goto errout;
-
- ret = blkid_probe_enable_superblocks(pr, 0);
- if (ret < 0)
- goto errout;
-
- ret = blkid_do_fullprobe(pr);
- if (ret < 0)
- goto errout;
-
- ret = blkid_probe_lookup_value(pr, "PTTYPE", &value, NULL);
- if (ret == 0)
- fprintf(stderr, _("Found a %s partition table in %s\n"),
- value, device);
- else
- ret = 1;
-
-errout:
- blkid_free_probe(pr);
- return ret;
-#else
- return -1;
-#endif
-}
-
-/*
- * return 1 if the device looks plausible, creating the file if necessary
- */
-int check_plausibility(const char *device, int flags, int *ret_is_dev)
-{
- int fd, ret, is_dev = 0;
- ext2fs_struct_stat s;
- int fl = O_RDONLY;
- blkid_cache cache = NULL;
- char *fs_type = NULL;
- char *fs_label = NULL;
-
- fd = ext2fs_open_file(device, fl, 0666);
- if ((fd < 0) && (errno == ENOENT) && (flags & NO_SIZE)) {
- fprintf(stderr, _("The file %s does not exist and no "
- "size was specified.\n"), device);
- exit(1);
- }
- if ((fd < 0) && (errno == ENOENT) && (flags & CREATE_FILE)) {
- fl |= O_CREAT;
- fd = ext2fs_open_file(device, fl, 0666);
- if (fd >= 0 && (flags & VERBOSE_CREATE))
- printf(_("Creating regular file %s\n"), device);
- }
- if (fd < 0) {
- fprintf(stderr, _("Could not open %s: %s\n"),
- device, error_message(errno));
- if (errno == ENOENT)
- fputs(_("\nThe device apparently does not exist; "
- "did you specify it correctly?\n"), stderr);
- exit(1);
- }
-
- if (ext2fs_fstat(fd, &s) < 0) {
- perror("stat");
- exit(1);
- }
- close(fd);
-
- if (S_ISBLK(s.st_mode))
- is_dev = 1;
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- /* On FreeBSD, all disk devices are character specials */
- if (S_ISCHR(s.st_mode))
- is_dev = 1;
-#endif
- if (ret_is_dev)
- *ret_is_dev = is_dev;
-
- if ((flags & CHECK_BLOCK_DEV) && !is_dev) {
- printf(_("%s is not a block special device.\n"), device);
- return 0;
- }
-
- /*
- * Note: we use the older-style blkid API's here because we
- * want as much functionality to be available when using the
- * internal blkid library, when e2fsprogs is compiled for
- * non-Linux systems that will probably not have the libraries
- * from util-linux available. We only use the newer
- * blkid-probe interfaces to access functionality not
- * available in the original blkid library.
- */
- if ((flags & CHECK_FS_EXIST) && blkid_get_cache(&cache, NULL) >= 0) {
- fs_type = blkid_get_tag_value(cache, "TYPE", device);
- if (fs_type)
- fs_label = blkid_get_tag_value(cache, "LABEL", device);
- blkid_put_cache(cache);
- }
-
- if (fs_type) {
- if (fs_label)
- printf(_("%s contains a %s file system "
- "labelled '%s'\n"), device, fs_type, fs_label);
- else
- printf(_("%s contains a %s file system\n"), device,
- fs_type);
- if (strncmp(fs_type, "ext", 3) == 0)
- print_ext2_info(device);
- free(fs_type);
- free(fs_label);
- return 0;
- }
-
- ret = check_partition_table(device);
- if (ret >= 0)
- return ret;
-
-#ifdef HAVE_LINUX_MAJOR_H
-#ifndef MAJOR
-#define MAJOR(dev) ((dev)>>8)
-#define MINOR(dev) ((dev) & 0xff)
-#endif
-#ifndef SCSI_BLK_MAJOR
-#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
-#define SCSI_BLK_MAJOR(M) ((M) == SCSI_DISK_MAJOR || (M) == SCSI_CDROM_MAJOR)
-#endif /* defined(SCSI_DISK0_MAJOR) */
-#endif /* defined(SCSI_BLK_MAJOR) */
- 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);
- return 0;
- }
-#endif
- return 1;
-}
-
void check_mount(const char *device, int force, const char *type)
{
errcode_t retval;
arg ? arg : "NONE");
#endif
if (strcmp(token, "device") == 0) {
- journal_device = blkid_get_devname(NULL, arg, NULL);
+ journal_device = get_devname(NULL, arg, NULL);
if (!journal_device) {
if (arg)
fprintf(stderr, _("\nCould not find "
journal_size = strtoul(arg, &p, 0);
if (*p)
journal_usage++;
+ } else if (strcmp(token, "fast_commit_size") == 0) {
+ if (!arg) {
+ journal_usage++;
+ continue;
+ }
+ journal_fc_size = strtoul(arg, &p, 0);
+ if (*p)
+ journal_usage++;
} else if (!strcmp(token, "location")) {
if (!arg) {
journal_usage++;
free(buf);
}
+static inline int jsize_to_blks(ext2_filsys fs, int size)
+{
+ return (size * 1024) / (fs->blocksize / 1024);
+}
+
+/* Fast commit size is in KBs */
+static inline int fcsize_to_blks(ext2_filsys fs, int size)
+{
+ return (size * 1024) / (fs->blocksize);
+}
+
/*
* Determine the number of journal blocks to use, either via
* user-specified # of megabytes, or via some intelligently selected
* defaults.
*
- * 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.
+ * 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.
*/
-unsigned int figure_journal_size(int size, ext2_filsys fs)
+void figure_journal_size(struct ext2fs_journal_params *jparams,
+ int requested_j_size, int requested_fc_size, ext2_filsys fs)
{
- int j_blocks;
+ int total_blocks, ret;
- j_blocks = ext2fs_default_journal_size(ext2fs_blocks_count(fs->super));
- if (j_blocks < 0) {
+ ret = ext2fs_get_journal_params(jparams, fs);
+ if (ret) {
fputs(_("\nFilesystem too small for a journal\n"), stderr);
- return 0;
+ return;
}
- if (size > 0) {
- j_blocks = size * 1024 / (fs->blocksize / 1024);
- if (j_blocks < 1024 || j_blocks > 10240000) {
- fprintf(stderr, _("\nThe requested journal "
+ if (requested_j_size > 0 ||
+ (ext2fs_has_feature_fast_commit(fs->super) && requested_fc_size > 0)) {
+ if (requested_j_size > 0)
+ jparams->num_journal_blocks =
+ jsize_to_blks(fs, requested_j_size);
+ if (ext2fs_has_feature_fast_commit(fs->super) &&
+ requested_fc_size > 0)
+ jparams->num_fc_blocks =
+ fcsize_to_blks(fs, requested_fc_size);
+ else if (!ext2fs_has_feature_fast_commit(fs->super))
+ jparams->num_fc_blocks = 0;
+ total_blocks = jparams->num_journal_blocks + jparams->num_fc_blocks;
+ if (total_blocks < 1024 || total_blocks > 10240000) {
+ fprintf(stderr, _("\nThe total requested journal "
"size is %d blocks; it must be\n"
"between 1024 and 10240000 blocks. "
"Aborting.\n"),
- j_blocks);
+ total_blocks);
exit(1);
}
- if ((unsigned) j_blocks > ext2fs_free_blocks_count(fs->super) / 2) {
- fputs(_("\nJournal size too big for filesystem.\n"),
+ if ((unsigned int) total_blocks > ext2fs_free_blocks_count(fs->super) / 2) {
+ fputs(_("\nTotal journal size too big for filesystem.\n"),
stderr);
exit(1);
}
}
- return j_blocks;
}
void print_check_message(int mnt, unsigned int check)
if (mmp) {
time_t t = mmp->mmp_time;
- printf("MMP error info: last update: %s node: %s device: %s\n",
- ctime(&t), mmp->mmp_nodename, mmp->mmp_bdevname);
+ printf("MMP error info: node: %.*s, device: %.*s, updated: %s",
+ EXT2_LEN_STR(mmp->mmp_nodename),
+ EXT2_LEN_STR(mmp->mmp_bdevname), ctime(&t));
}
}
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff