mirror of
https://github.com/nilfs-dev/nilfs-utils.git
synced 2026-01-26 13:43:15 +00:00
nilfs-utils: fix unnecessary line continuations for output messages
Fix the checkpatch.pl warning "WARNING: Avoid unnecessary line continuations". Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
This commit is contained in:
Ryusuke Konishi
parent
a2ab16bafb
commit
68dc048aa5
@ -95,8 +95,7 @@ static int show_all;
|
||||
|
||||
static void lscp_print_header(void)
|
||||
{
|
||||
printf(" CNO DATE TIME MODE FLG %s" \
|
||||
" ICNT\n",
|
||||
printf(" CNO DATE TIME MODE FLG %s ICNT\n",
|
||||
show_block_count ? " BLKCNT" : "NBLKINC");
|
||||
}
|
||||
|
||||
|
||||
@ -99,8 +99,7 @@ static const struct lssu_format lssu_format[] = {
|
||||
"%20llu %s %c%c%c %10u\n"
|
||||
},
|
||||
{
|
||||
" SEGNUM DATE TIME STAT NBLOCKS" \
|
||||
" NLIVEBLOCKS",
|
||||
" SEGNUM DATE TIME STAT NBLOCKS NLIVEBLOCKS",
|
||||
"%17llu %s %c%c%c%c %10u %10u (%3u%%)\n"
|
||||
}
|
||||
};
|
||||
@ -286,8 +285,7 @@ static int lssu_get_protcno(struct nilfs *nilfs,
|
||||
ret = nilfs_cnoconv_time2cno(cnoconv, *prottimep, protcnop);
|
||||
if (ret < 0) {
|
||||
fprintf(stderr,
|
||||
"%s: cannot convert protection time to checkpoint "
|
||||
"number: %m\n",
|
||||
"%s: cannot convert protection time to checkpoint number: %m\n",
|
||||
progname);
|
||||
}
|
||||
|
||||
|
||||
@ -251,8 +251,7 @@ static int nilfs_cleaner_find_fs(struct nilfs_cleaner *cleaner,
|
||||
}
|
||||
if (nfound == 0) {
|
||||
nilfs_cleaner_logger(LOG_ERR,
|
||||
_("Error: no valid nilfs mountpoint " \
|
||||
"found."));
|
||||
_("Error: no valid nilfs mountpoint found."));
|
||||
goto abort;
|
||||
}
|
||||
if (last_match_dir)
|
||||
@ -302,8 +301,7 @@ static int nilfs_cleaner_open_queue(struct nilfs_cleaner *cleaner)
|
||||
&attr);
|
||||
if (cleaner->recvq < 0) {
|
||||
nilfs_cleaner_logger(LOG_ERR,
|
||||
_("Error: cannot create receive queue: " \
|
||||
"%s."),
|
||||
_("Error: cannot create receive queue: %s."),
|
||||
strerror(errno));
|
||||
free(cleaner->recvq_name);
|
||||
goto abort;
|
||||
|
||||
@ -289,8 +289,7 @@ static int nilfs_wait_cleanerd(const char *device, pid_t pid)
|
||||
recalc_backoff_time(&waittime);
|
||||
}
|
||||
|
||||
nilfs_cleaner_printf(_("cleanerd (pid=%ld) still exists on %d. " \
|
||||
"waiting."),
|
||||
nilfs_cleaner_printf(_("cleanerd (pid=%ld) still exists on %d. waiting."),
|
||||
(long)pid, device);
|
||||
nilfs_cleaner_flush();
|
||||
|
||||
|
||||
11
lib/gc.c
11
lib/gc.c
@ -357,13 +357,10 @@ static ssize_t nilfs_get_snapshot(struct nilfs *nilfs, nilfs_cno_t **ssp)
|
||||
for (j = 0; j < n; j++) {
|
||||
ss[i + j] = cpinfo[j].ci_cno;
|
||||
if (prev >= ss[i + j]) {
|
||||
nilfs_gc_logger
|
||||
(LOG_ERR,
|
||||
"broken snapshot information. "
|
||||
"snapshot numbers appeared in a "
|
||||
"non-ascending order: %llu >= %llu",
|
||||
(unsigned long long)prev,
|
||||
(unsigned long long)ss[i + j]);
|
||||
nilfs_gc_logger(LOG_ERR,
|
||||
"broken snapshot information. snapshot numbers appeared in a non-ascending order: %llu >= %llu",
|
||||
(unsigned long long)prev,
|
||||
(unsigned long long)ss[i + j]);
|
||||
free(ss);
|
||||
errno = EIO;
|
||||
return -1;
|
||||
|
||||
@ -1390,8 +1390,7 @@ static int nilfs_cleanerd_clean_segments(struct nilfs_cleanerd *cleanerd,
|
||||
¶ms.protcno);
|
||||
if (ret < 0) {
|
||||
syslog(LOG_ERR,
|
||||
"cannot convert protection time to checkpoint " \
|
||||
"number: %m");
|
||||
"cannot convert protection time to checkpoint number: %m");
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
||||
@ -507,8 +507,8 @@ static void init_disk_layout(struct nilfs_disk_info *di, int fd,
|
||||
if (di->nsegments < min_nsegments)
|
||||
perr("Error: too small device.\n"
|
||||
" device size=%llu bytes, required size=%llu bytes.\n"
|
||||
" Please enlarge the device, "
|
||||
"or shorten segments with -B option.", dev_size,
|
||||
" Please enlarge the device, or shorten segments with -B option.",
|
||||
dev_size,
|
||||
(unsigned long long)segment_size * min_nsegments);
|
||||
di->nseginfo = 0;
|
||||
}
|
||||
@ -721,8 +721,7 @@ static void check_mount(int fd, const char *device)
|
||||
if (strncmp(strtok(line, " "), device, strlen(device)) == 0) {
|
||||
fclose(fp);
|
||||
close(fd);
|
||||
perr("Error: %s is currently mounted. " \
|
||||
"You cannot make a filesystem on this device.",
|
||||
perr("Error: %s is currently mounted. You cannot make a filesystem on this device.",
|
||||
device);
|
||||
}
|
||||
}
|
||||
@ -763,18 +762,16 @@ static void check_safety_of_device_overwrite(int fd, const char *device)
|
||||
|
||||
if (!blkid_probe_lookup_value(pr, "TYPE",
|
||||
&type, NULL)) {
|
||||
pinfo("WARNING: Device %s appears to contain" \
|
||||
" an existing %s superblock.",
|
||||
pinfo("WARNING: Device %s appears to contain an existing %s superblock.",
|
||||
device, type);
|
||||
} else if (!blkid_probe_lookup_value(pr, "PTTYPE",
|
||||
&type, NULL)) {
|
||||
pinfo("WARNING: Device %s appears to contain" \
|
||||
" an partition table (%s).",
|
||||
pinfo("WARNING: Device %s appears to contain an partition table (%s).",
|
||||
device, type);
|
||||
} else {
|
||||
if (quiet == 0) {
|
||||
pinfo("Device %s appears to contain" \
|
||||
" something weird.", device);
|
||||
pinfo("Device %s appears to contain something weird.",
|
||||
device);
|
||||
}
|
||||
goto end_check;
|
||||
}
|
||||
@ -851,8 +848,8 @@ static void init_disk_buffer(long max_blocks)
|
||||
static void *map_disk_buffer(blocknr_t blocknr, int clear_flag)
|
||||
{
|
||||
if (blocknr >= disk_buffer_size)
|
||||
perr("Internal error: illegal disk buffer access " \
|
||||
"(blocknr=%llu)", blocknr);
|
||||
perr("Internal error: illegal disk buffer access (blocknr=%llu)",
|
||||
blocknr);
|
||||
|
||||
if (!disk_buffer[blocknr]) {
|
||||
if (posix_memalign(&disk_buffer[blocknr], blocksize,
|
||||
@ -937,8 +934,7 @@ static int erase_disk(int fd, struct nilfs_disk_info *di)
|
||||
ret = nilfs_mkfs_discard_range(fd, start, end - start);
|
||||
if (!ret && nilfs_mkfs_discard_zeroes_data(fd)) {
|
||||
if (verbose)
|
||||
pinfo("Discard succeeded and will return 0s " \
|
||||
" - skip wiping");
|
||||
pinfo("Discard succeeded and will return 0s - skip wiping");
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
@ -1158,10 +1154,9 @@ static void parse_options(int argc, char *argv[])
|
||||
static void usage(void)
|
||||
{
|
||||
fprintf(stderr,
|
||||
"Usage: %s [-b block-size] [-B blocks-per-segment] [-c] " \
|
||||
"[-f]\n" \
|
||||
" [-L volume-label] [-m reserved-segments-percentage]\n" \
|
||||
" [-O feature[,...]]\n" \
|
||||
"Usage: %s [-b block-size] [-B blocks-per-segment] [-c] [-f]\n"
|
||||
" [-L volume-label] [-m reserved-segments-percentage]\n"
|
||||
" [-O feature[,...]]\n"
|
||||
" [-hnqvKV] device\n",
|
||||
progname);
|
||||
}
|
||||
|
||||
@ -198,8 +198,7 @@ read_mounttable() {
|
||||
return;
|
||||
}
|
||||
if (verbose)
|
||||
printf(_("mount: could not open %s - " \
|
||||
"using %s instead\n"),
|
||||
printf(_("mount: could not open %s - using %s instead\n"),
|
||||
_PATH_MOUNTED, _PATH_PROC_MOUNTS);
|
||||
}
|
||||
read_mntentchn(mfp, fnam, mc);
|
||||
@ -428,8 +427,7 @@ void lock_mtab(void)
|
||||
and we cannot create it. Read-only filesystem?
|
||||
Too many files open in the system?
|
||||
Filesystem full? */
|
||||
die(EX_FILEIO, _("can't create lock file %s: %s " \
|
||||
"(use -n flag to override)"),
|
||||
die(EX_FILEIO, _("can't create lock file %s: %s (use -n flag to override)"),
|
||||
linktargetfile, strerror(errsv));
|
||||
}
|
||||
close(i);
|
||||
@ -454,8 +452,7 @@ void lock_mtab(void)
|
||||
|
||||
if (j < 0 && errsv != EEXIST) {
|
||||
(void) unlink(linktargetfile);
|
||||
die(EX_FILEIO, _("can't link lock file %s: %s " \
|
||||
"(use -n flag to override)"),
|
||||
die(EX_FILEIO, _("can't link lock file %s: %s (use -n flag to override)"),
|
||||
_PATH_MOUNTED_LOCK, strerror(errsv));
|
||||
}
|
||||
|
||||
@ -471,8 +468,7 @@ void lock_mtab(void)
|
||||
continue;
|
||||
}
|
||||
(void) unlink(linktargetfile);
|
||||
die(EX_FILEIO, _("can't open lock file %s: %s " \
|
||||
"(use -n flag to override)"),
|
||||
die(EX_FILEIO, _("can't open lock file %s: %s (use -n flag to override)"),
|
||||
_PATH_MOUNTED_LOCK, strerror(errsv));
|
||||
}
|
||||
|
||||
@ -514,7 +510,7 @@ void lock_mtab(void)
|
||||
} else {
|
||||
(void) unlink(linktargetfile);
|
||||
die(EX_FILEIO,
|
||||
_("Cannot create link %s\n" \
|
||||
_("Cannot create link %s\n"
|
||||
"Perhaps there is a stale lock file?\n"),
|
||||
_PATH_MOUNTED_LOCK);
|
||||
}
|
||||
|
||||
@ -375,10 +375,9 @@ static int check_mtab(void)
|
||||
if (mtab_is_writable())
|
||||
res++;
|
||||
else
|
||||
error(_("%s: cannot modify " _PATH_MOUNTED ".\n"
|
||||
"Please remount the partition with -f option"
|
||||
" after making " _PATH_MOUNTED " writable."),
|
||||
progname);
|
||||
error(_("%s: cannot modify %s.\n"
|
||||
"Please remount the partition with -f option after making %s writable."),
|
||||
progname, _PATH_MOUNTED, _PATH_MOUNTED);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
@ -418,8 +417,8 @@ prepare_mount(struct nilfs_mount_info *mi, const struct mount_options *mo)
|
||||
|
||||
switch (mo->flags & (MS_RDONLY | MS_REMOUNT)) {
|
||||
case 0: /* overlapping rw-mount */
|
||||
error(_("%s: the device already has a rw-mount on %s." \
|
||||
"\n\t\tmultiple rw-mount is not allowed."),
|
||||
error(_("%s: the device already has a rw-mount on %s.\n"
|
||||
"\t\tmultiple rw-mount is not allowed."),
|
||||
progname, mc->m.mnt_dir);
|
||||
goto failed;
|
||||
case MS_RDONLY: /* ro-mount (a rw-mount exists) */
|
||||
@ -434,8 +433,8 @@ prepare_mount(struct nilfs_mount_info *mi, const struct mount_options *mo)
|
||||
pid = 0;
|
||||
if (find_opt(mc->m.mnt_opts, gcpid_opt_fmt, &pid) >= 0 &&
|
||||
nilfs_shutdown_cleanerd(mi->device, (pid_t)pid) < 0) {
|
||||
error(_("%s: remount failed due to %s shutdown " \
|
||||
"failure"), progname, NILFS_CLEANERD_NAME);
|
||||
error(_("%s: remount failed due to %s shutdown failure"),
|
||||
progname, NILFS_CLEANERD_NAME);
|
||||
goto failed;
|
||||
}
|
||||
mi->gcpid = pid;
|
||||
|
||||
@ -297,8 +297,8 @@ static int nilfs_prepare_mount(struct nilfs_mount_info *mi)
|
||||
|
||||
switch (mi->mflags & (MS_RDONLY | MS_REMOUNT)) {
|
||||
case 0: /* overlapping rw-mount */
|
||||
error(_("%s: the device already has a rw-mount on %s." \
|
||||
"\n\t\tmultiple rw-mount is not allowed."),
|
||||
error(_("%s: the device already has a rw-mount on %s.\n"
|
||||
"\t\tmultiple rw-mount is not allowed."),
|
||||
progname, mnt_fs_get_target(fs));
|
||||
goto failed;
|
||||
case MS_RDONLY: /* ro-mount (a rw-mount exists) */
|
||||
@ -320,8 +320,7 @@ static int nilfs_prepare_mount(struct nilfs_mount_info *mi)
|
||||
|
||||
if (!mnt_fs_match_target(fs, mnt_context_get_target(cxt),
|
||||
mnt_table_get_cache(mtab))) {
|
||||
error(_("%s: different mount point (%s). " \
|
||||
"remount failed."),
|
||||
error(_("%s: different mount point (%s). remount failed."),
|
||||
progname, mnt_context_get_target(cxt));
|
||||
goto failed;
|
||||
}
|
||||
@ -330,9 +329,8 @@ static int nilfs_prepare_mount(struct nilfs_mount_info *mi)
|
||||
res = nilfs_shutdown_cleanerd(
|
||||
mnt_fs_get_source(fs), mi->old_attrs.gcpid);
|
||||
if (res < 0) {
|
||||
error(_("%s: remount failed due to %s " \
|
||||
"shutdown failure"), progname,
|
||||
NILFS_CLEANERD_NAME);
|
||||
error(_("%s: remount failed due to %s shutdown failure"),
|
||||
progname, NILFS_CLEANERD_NAME);
|
||||
goto failed;
|
||||
}
|
||||
}
|
||||
|
||||
@ -179,8 +179,7 @@ struct my_mntent *my_getmntent(mntFILE *mfp)
|
||||
/* long line - assume file was corrupted */
|
||||
if (feof(mfp->mntent_fp)) {
|
||||
fprintf(stderr,
|
||||
_("[mntent]: warning: no final " \
|
||||
"newline at the end of %s\n"),
|
||||
_("[mntent]: warning: no final newline at the end of %s\n"),
|
||||
mfp->mntent_file);
|
||||
s = index(buf, 0);
|
||||
} else {
|
||||
|
||||
@ -464,8 +464,8 @@ static void nilfs_clean_parse_options(int argc, char *argv[])
|
||||
myprintf(_("Error: too large period: %s\n"),
|
||||
optarg);
|
||||
} else {
|
||||
myprintf(_("Error: invalid protection " \
|
||||
"period: %s\n"), optarg);
|
||||
myprintf(_("Error: invalid protection period: %s\n"),
|
||||
optarg);
|
||||
}
|
||||
exit(EXIT_FAILURE);
|
||||
case 'q':
|
||||
|
||||
@ -349,17 +349,16 @@ static int nilfs_resize_check_free_space(struct nilfs *nilfs, __u64 newnsegs)
|
||||
nsegs = (sustat.ss_nsegs - newnsegs) - sustat.ss_ncleansegs
|
||||
+ nrsvsegs;
|
||||
nbytes = (nsegs * blocks_per_segment) << blocksize_bits;
|
||||
myprintf("Error: the filesystem does not have enough free " \
|
||||
"space.\n" \
|
||||
" At least %llu more segments (%llu bytes) " \
|
||||
"are required.\n", nsegs, nbytes);
|
||||
myprintf("Error: the filesystem does not have enough free space.\n"
|
||||
" At least %llu more segments (%llu bytes) are required.\n",
|
||||
nsegs, nbytes);
|
||||
return -1;
|
||||
} else if (verbose) {
|
||||
nsegs = sustat.ss_ncleansegs - (sustat.ss_nsegs - newnsegs)
|
||||
- nrsvsegs;
|
||||
nbytes = (nsegs * blocks_per_segment) << blocksize_bits;
|
||||
myprintf("%llu free segments (%llu bytes) will be left " \
|
||||
"after shrinkage.\n", nsegs, nbytes);
|
||||
myprintf("%llu free segments (%llu bytes) will be left after shrinkage.\n",
|
||||
nsegs, nbytes);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -389,8 +388,8 @@ nilfs_resize_find_movable_segments(struct nilfs *nilfs, __u64 start,
|
||||
count = min_t(unsigned long, rest, NILFS_RESIZE_NSUINFO);
|
||||
nsi = nilfs_get_suinfo(nilfs, segnum, suinfo, count);
|
||||
if (nsi < 0) {
|
||||
myprintf("Error: operation failed during searching " \
|
||||
"movable segments: %s\n", strerror(errno));
|
||||
myprintf("Error: operation failed during searching movable segments: %s\n",
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
for (i = 0; i < nsi; i++, segnum++) {
|
||||
@ -426,8 +425,8 @@ nilfs_resize_get_latest_segment(struct nilfs *nilfs, __u64 start, __u64 end,
|
||||
NILFS_RESIZE_NSUINFO);
|
||||
nsi = nilfs_get_suinfo(nilfs, segnum, suinfo, count);
|
||||
if (nsi < 0) {
|
||||
myprintf("Error: operation failed during searching " \
|
||||
"latest segment: %s\n", strerror(errno));
|
||||
myprintf("Error: operation failed during searching latest segment: %s\n",
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
assert(nsi > 0);
|
||||
@ -464,8 +463,8 @@ nilfs_resize_find_active_segments(struct nilfs *nilfs, __u64 start, __u64 end,
|
||||
count = min_t(unsigned long, rest, NILFS_RESIZE_NSUINFO);
|
||||
nsi = nilfs_get_suinfo(nilfs, segnum, suinfo, count);
|
||||
if (nsi < 0) {
|
||||
myprintf("Error: operation failed during searching " \
|
||||
"active segments: %s\n", strerror(errno));
|
||||
myprintf("Error: operation failed during searching active segments: %s\n",
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
for (i = 0; i < nsi; i++, segnum++) {
|
||||
@ -495,8 +494,8 @@ nilfs_resize_find_inuse_segments(struct nilfs *nilfs, __u64 start, __u64 end,
|
||||
count = min_t(unsigned long, rest, NILFS_RESIZE_NSUINFO);
|
||||
nsi = nilfs_get_suinfo(nilfs, segnum, suinfo, count);
|
||||
if (nsi < 0) {
|
||||
myprintf("Error: operation failed during searching " \
|
||||
"in-use segments: %s\n", strerror(errno));
|
||||
myprintf("Error: operation failed during searching in-use segments: %s\n",
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
for (i = 0; i < nsi; i++, segnum++) {
|
||||
@ -525,8 +524,8 @@ nilfs_resize_count_inuse_segments(struct nilfs *nilfs, __u64 start, __u64 end)
|
||||
count = min_t(unsigned long, rest, NILFS_RESIZE_NSUINFO);
|
||||
nsi = nilfs_get_suinfo(nilfs, segnum, suinfo, count);
|
||||
if (nsi < 0) {
|
||||
myprintf("Error: operation failed during counting " \
|
||||
"in-use segments: %s\n", strerror(errno));
|
||||
myprintf("Error: operation failed during counting in-use segments: %s\n",
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
for (i = 0; i < nsi; i++, segnum++) {
|
||||
@ -721,12 +720,11 @@ static int nilfs_resize_move_out_active_segments(struct nilfs *nilfs,
|
||||
break;
|
||||
|
||||
if (retrycnt >= 6) {
|
||||
myprintf("Error: Failed to move active segments -- " \
|
||||
"give up.\n");
|
||||
myprintf("Error: Failed to move active segments -- give up.\n");
|
||||
return -1;
|
||||
}
|
||||
if (verbose && !retrycnt) {
|
||||
myprintf("Active segments are found in the range.\n" \
|
||||
myprintf("Active segments are found in the range.\n"
|
||||
"Trying to move them.\n");
|
||||
}
|
||||
if (nilfs_resize_reclaim_nibble(
|
||||
@ -748,8 +746,7 @@ static int nilfs_resize_reclaim_range(struct nilfs *nilfs, __u64 newnsegs)
|
||||
return -1;
|
||||
|
||||
if (newnsegs > sustat.ss_nsegs) {
|
||||
myprintf("Error: Confused. Number of segments became larger " \
|
||||
"than requested size.\n");
|
||||
myprintf("Error: Confused. Number of segments became larger than requested size.\n");
|
||||
return -1;
|
||||
}
|
||||
if (newnsegs == sustat.ss_nsegs)
|
||||
@ -794,8 +791,8 @@ static int nilfs_resize_reclaim_range(struct nilfs *nilfs, __u64 newnsegs)
|
||||
nmoved = nilfs_resize_move_segments(
|
||||
nilfs, segnums, nfound, &reason);
|
||||
if (nmoved < 0) {
|
||||
myprintf("Error: operation failed during moving " \
|
||||
"in-use segments: %s\n", strerror(errno));
|
||||
myprintf("Error: operation failed during moving in-use segments: %s\n",
|
||||
strerror(errno));
|
||||
goto out;
|
||||
}
|
||||
|
||||
@ -854,7 +851,7 @@ static int nilfs_shrink_online(struct nilfs *nilfs, const char *device,
|
||||
newsb2off = NILFS_SB2_OFFSET_BYTES(newsize);
|
||||
newnsegs = (newsb2off >> blocksize_bits) / blocks_per_segment;
|
||||
|
||||
myprintf("Partition size = %llu bytes.\n" \
|
||||
myprintf("Partition size = %llu bytes.\n"
|
||||
"Shrink the filesystem size from %llu bytes to %llu bytes.\n",
|
||||
devsize, fs_devsize, newsize);
|
||||
|
||||
@ -862,15 +859,13 @@ static int nilfs_shrink_online(struct nilfs *nilfs, const char *device,
|
||||
goto out;
|
||||
|
||||
if (newnsegs < sustat.ss_nsegs) {
|
||||
myprintf("%llu segments will be truncated from " \
|
||||
"segnum %llu.\n",
|
||||
myprintf("%llu segments will be truncated from segnum %llu.\n",
|
||||
(unsigned long long)sustat.ss_nsegs - newnsegs,
|
||||
(unsigned long long)newnsegs);
|
||||
} else if (newnsegs == sustat.ss_nsegs) {
|
||||
myprintf("No segments will be truncated.\n");
|
||||
} else {
|
||||
myprintf("Error: Confused. Number of segments " \
|
||||
"became larger than requested size:\n" \
|
||||
myprintf("Error: Confused. Number of segments became larger than requested size:\n"
|
||||
" old-nsegs=%llu new-nsegs=%llu\n",
|
||||
(unsigned long long)sustat.ss_nsegs,
|
||||
(unsigned long long)newnsegs);
|
||||
@ -883,10 +878,8 @@ static int nilfs_shrink_online(struct nilfs *nilfs, const char *device,
|
||||
if (nilfs_set_alloc_range(nilfs, 0, newsize) < 0) {
|
||||
myprintf("Error: failed to limit allocation range: %s\n",
|
||||
strerror(errno));
|
||||
if (errno == ENOTTY) {
|
||||
myprintf(" This kernel does not support the " \
|
||||
"set allocation range API.\n");
|
||||
}
|
||||
if (errno == ENOTTY)
|
||||
myprintf(" This kernel does not support the set allocation range API.\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
@ -936,8 +929,7 @@ static int nilfs_shrink_online(struct nilfs *nilfs, const char *device,
|
||||
goto restore_alloc_range;
|
||||
|
||||
if (verbose) {
|
||||
myprintf("In-use segment found again. " \
|
||||
"will retry moving them.. (retry = %d)\n",
|
||||
myprintf("In-use segment found again. will retry moving them.. (retry = %d)\n",
|
||||
retry + 1);
|
||||
}
|
||||
}
|
||||
@ -957,9 +949,9 @@ static int nilfs_extend_online(struct nilfs *nilfs, const char *device,
|
||||
int status = EXIT_FAILURE;
|
||||
sigset_t sigset;
|
||||
|
||||
myprintf("Partition size = %llu bytes.\n" \
|
||||
"Extend the filesystem size from %llu bytes to %llu " \
|
||||
"bytes.\n", devsize, fs_devsize, newsize);
|
||||
myprintf("Partition size = %llu bytes.\n"
|
||||
"Extend the filesystem size from %llu bytes to %llu bytes.\n",
|
||||
devsize, fs_devsize, newsize);
|
||||
if (!assume_yes && nilfs_resize_prompt(newsize) < 0)
|
||||
goto out;
|
||||
|
||||
@ -999,7 +991,7 @@ static int nilfs_resize_online(const char *device, unsigned long long newsize)
|
||||
nilfs_resize_update_super(sb);
|
||||
|
||||
if (newsize == fs_devsize) {
|
||||
myprintf("No need to resize the filesystem on %s.\n" \
|
||||
myprintf("No need to resize the filesystem on %s.\n"
|
||||
"It already fits the device.\n", device);
|
||||
status = EXIT_SUCCESS;
|
||||
goto out_unlock;
|
||||
@ -1172,8 +1164,8 @@ int main(int argc, char *argv[])
|
||||
goto out;
|
||||
}
|
||||
if (size > devsize) {
|
||||
myprintf("Error: size larger than partition " \
|
||||
"size (%llu bytes).\n", devsize);
|
||||
myprintf("Error: size larger than partition size (%llu bytes).\n",
|
||||
devsize);
|
||||
goto out;
|
||||
}
|
||||
|
||||
@ -1187,8 +1179,7 @@ int main(int argc, char *argv[])
|
||||
unsigned long long size2;
|
||||
|
||||
size2 = size & ~(sector_size - 1);
|
||||
myprintf("size %llu is not aligned to sector " \
|
||||
"size. truncated to %llu.\n",
|
||||
myprintf("size %llu is not aligned to sector size. truncated to %llu.\n",
|
||||
size, size2);
|
||||
size = size2;
|
||||
}
|
||||
@ -1198,8 +1189,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
|
||||
if (check_mount(device) == 0) {
|
||||
myprintf("Error: %s is not currently mounted. Offline " \
|
||||
"resizing\n" \
|
||||
myprintf("Error: %s is not currently mounted. Offline resizing\n"
|
||||
" is not supported at present.\n", device);
|
||||
goto out;
|
||||
} else {
|
||||
|
||||
@ -72,8 +72,8 @@ struct nilfs_tune_options {
|
||||
|
||||
static void nilfs_tune_usage(void)
|
||||
{
|
||||
printf("Usage: nilfs-tune [-h] [-l] [-i interval] [-L volume_name]\n" \
|
||||
" [-m block_max] [-O [^]feature[,...]]\n" \
|
||||
printf("Usage: nilfs-tune [-h] [-l] [-i interval] [-L volume_name]\n"
|
||||
" [-m block_max] [-O [^]feature[,...]]\n"
|
||||
" [-U UUID] device\n");
|
||||
}
|
||||
|
||||
@ -280,10 +280,9 @@ static const char *uuid_string(const unsigned char *uuid)
|
||||
{
|
||||
static char buf[256];
|
||||
|
||||
sprintf(buf, "%02x%02x%02x%02x-%02x%02x-%02x%02x-" \
|
||||
"%02x%02x-%02x%02x%02x%02x%02x%02x", uuid[0], uuid[1],
|
||||
uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7],
|
||||
uuid[8], uuid[9], uuid[10], uuid[11], uuid[12],
|
||||
sprintf(buf, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
|
||||
uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6],
|
||||
uuid[7], uuid[8], uuid[9], uuid[10], uuid[11], uuid[12],
|
||||
uuid[13], uuid[14], uuid[15]);
|
||||
return buf;
|
||||
}
|
||||
@ -519,14 +518,14 @@ static int modify_nilfs(const char *device, struct nilfs_tune_options *opts)
|
||||
|
||||
features = le64_to_cpu(sbp->s_feature_incompat);
|
||||
if (features & ~NILFS_FEATURE_INCOMPAT_SUPP)
|
||||
fprintf(stderr, "Warning: %s: unknown incompatible " \
|
||||
"features: 0x%llx\n", device, features);
|
||||
fprintf(stderr, "Warning: %s: unknown incompatible features: 0x%llx\n",
|
||||
device, features);
|
||||
|
||||
features = le64_to_cpu(sbp->s_feature_compat_ro);
|
||||
if (opts->flags == O_RDWR &&
|
||||
(features & ~NILFS_FEATURE_COMPAT_RO_SUPP))
|
||||
fprintf(stderr, "Warning: %s: unknown read-only compatible " \
|
||||
"features: 0x%llx\n", device, features);
|
||||
fprintf(stderr, "Warning: %s: unknown read-only compatible features: 0x%llx\n",
|
||||
device, features);
|
||||
|
||||
if (opts->mask & NILFS_SB_LABEL)
|
||||
memcpy(sbp->s_volume_name, opts->label,
|
||||
@ -583,12 +582,9 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
if (!opts.force && opts.flags == O_RDWR && (check_mount(device) < 0)) {
|
||||
fprintf(stderr, "ERROR: %s is currently mounted. " \
|
||||
"Aborting execution.\n" \
|
||||
"Running nilfs-tune on a mounted file system " \
|
||||
"may cause SEVERE damage.\n" \
|
||||
"You can use the \"-f\" option to force this " \
|
||||
"operation.\n",
|
||||
fprintf(stderr, "ERROR: %s is currently mounted. Aborting execution.\n"
|
||||
"Running nilfs-tune on a mounted file system may cause SEVERE damage.\n"
|
||||
"You can use the \"-f\" option to force this operation.\n",
|
||||
device);
|
||||
exit(EXIT_SUCCESS);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user