X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=misc%2Ffilefrag.c;h=9dab7472652479a83b06b988e08b75a3dd8f126f;hb=64ed1351c8ffaa07944dd16780879a62f7d2df7c;hp=ee03a07af296a0ab7d66ad17b84d18453d0f4aac;hpb=e3507739e4185bdb2394928eb6479e48f4e690a8;p=tools%2Fe2fsprogs.git diff --git a/misc/filefrag.c b/misc/filefrag.c index ee03a07..9dab747 100644 --- a/misc/filefrag.c +++ b/misc/filefrag.c @@ -20,7 +20,13 @@ int main(void) { exit(EXIT_FAILURE); } #else +#ifndef _LARGEFILE_SOURCE +#define _LARGEFILE_SOURCE +#endif +#ifndef _LARGEFILE64_SOURCE #define _LARGEFILE64_SOURCE +#endif + #include #include @@ -39,23 +45,30 @@ extern int optind; #include #include #include +#ifdef HAVE_LINUX_FD_H #include +#endif #include #include #include +#include "../version.h" int verbose = 0; -int blocksize; /* Use specified blocksize (default 1kB) */ +unsigned int blocksize; /* Use specified blocksize (default 1kB) */ int sync_file = 0; /* fsync file before getting the mapping */ +int precache_file = 0; /* precache the file before getting the mapping */ int xattr_map = 0; /* get xattr mapping */ -int force_bmap; /* force use of FIBMAP instead of FIEMAP */ +int force_bmap; /* force use of FIBMAP instead of FIEMAP */ int force_extent; /* print output in extent format always */ +int use_extent_cache; /* Use extent cache */ +int device_offset; /* extents report device-relative offsets */ int logical_width = 8; int physical_width = 10; -char *ext_fmt = "%4d: %*llu..%*llu: %*llu..%*llu: %6llu: %s\n"; -char *hex_fmt = "%4d: %*llx..%*llx: %*llx..%*llx: %6llx: %s\n"; +const char *ext_fmt = "%4d: %*llu..%*llu: %*llu..%*llu: %6llu: %s\n"; +const char *hex_fmt = "%4d: %*llx..%*llx: %*llx..%*llx: %6llx: %s\n"; -#define FILEFRAG_FIEMAP_FLAGS_COMPAT (FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR) +#define FILEFRAG_FIEMAP_FLAGS_COMPAT (FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR |\ + FIEMAP_FLAG_DEVICE_ORDER) #define FIBMAP _IO(0x00, 1) /* bmap access */ #define FIGETBSZ _IO(0x00, 2) /* get the block size used for bmap */ @@ -65,7 +78,7 @@ char *hex_fmt = "%4d: %*llx..%*llx: %*llx..%*llx: %6llx: %s\n"; #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT3_IOC_GETFLAGS _IOR('f', 1, long) -static int int_log2(int arg) +static int ulong_log2(unsigned long arg) { int l = 0; @@ -77,7 +90,7 @@ static int int_log2(int arg) return l; } -static int int_log10(unsigned long long arg) +static int ulong_log10(unsigned long long arg) { int l = 0; @@ -103,12 +116,8 @@ static int get_bmap(int fd, unsigned long block, unsigned long *phy_blk) b = block; ret = ioctl(fd, FIBMAP, &b); /* FIBMAP takes pointer to integer */ - if (ret < 0) { - if (errno == EPERM) { - fprintf(stderr, "No permission to use FIBMAP ioctl; " - "must have root privileges\n"); - } - } + if (ret < 0) + return -errno; *phy_blk = b; return ret; @@ -118,10 +127,57 @@ static void print_extent_header(void) { printf(" ext: %*s %*s length: %*s flags:\n", logical_width * 2 + 3, - "logical_offset:", + device_offset ? "device_logical:" : "logical_offset:", physical_width * 2 + 3, "physical_offset:", - physical_width + 1, - "expected:"); + device_offset ? 5 : physical_width + 1, + device_offset ? " dev:" : "expected:"); +} + +static void print_flag(__u32 *flags, __u32 mask, char *buf, const char *name) +{ + char hex[sizeof(mask) * 2 + 4]; /* 2 chars/byte + 0x, + NUL */ + + if ((*flags & mask) == 0) + return; + + if (name == NULL) { + sprintf(hex, "%#04x,", mask); + name = hex; + } + strcat(buf, name); + *flags &= ~mask; +} + +static void print_flags(__u32 fe_flags, char *flags, int len, int print_unknown) +{ + __u32 mask; + + print_flag(&fe_flags, FIEMAP_EXTENT_LAST, flags, "last,"); + print_flag(&fe_flags, FIEMAP_EXTENT_UNKNOWN, flags, "unknown_loc,"); + print_flag(&fe_flags, FIEMAP_EXTENT_DELALLOC, flags, "delalloc,"); + print_flag(&fe_flags, FIEMAP_EXTENT_ENCODED, flags, "encoded,"); + print_flag(&fe_flags, FIEMAP_EXTENT_DATA_ENCRYPTED, flags,"encrypted,"); + print_flag(&fe_flags, FIEMAP_EXTENT_NOT_ALIGNED, flags, "not_aligned,"); + print_flag(&fe_flags, FIEMAP_EXTENT_DATA_INLINE, flags, "inline,"); + print_flag(&fe_flags, FIEMAP_EXTENT_DATA_TAIL, flags, "tail_packed,"); + print_flag(&fe_flags, FIEMAP_EXTENT_UNWRITTEN, flags, "unwritten,"); + print_flag(&fe_flags, FIEMAP_EXTENT_MERGED, flags, "merged,"); + print_flag(&fe_flags, FIEMAP_EXTENT_SHARED, flags, "shared,"); + print_flag(&fe_flags, EXT4_FIEMAP_EXTENT_HOLE, flags, "hole,"); + + print_flag(&fe_flags, FIEMAP_EXTENT_NET, flags, "net,"); + + if (!print_unknown) + goto out; + + /* print any unknown flags as hex values */ + for (mask = 1; fe_flags != 0 && mask != 0; mask <<= 1) + print_flag(&fe_flags, mask, flags, NULL); +out: + /* Remove trailing comma, if any */ + if (flags[0]) + flags[strnlen(flags, len) - 1] = '\0'; + } static void print_extent_info(struct fiemap_extent *fm_extent, int cur_ex, @@ -132,6 +188,7 @@ static void print_extent_info(struct fiemap_extent *fm_extent, int cur_ex, unsigned long long logical_blk; unsigned long long ext_len; unsigned long long ext_blks; + unsigned long long ext_blks_phys; char flags[256] = ""; /* For inline data all offsets should be in bytes, not blocks */ @@ -141,80 +198,99 @@ static void print_extent_info(struct fiemap_extent *fm_extent, int cur_ex, ext_len = fm_extent->fe_length >> blk_shift; ext_blks = (fm_extent->fe_length - 1) >> blk_shift; logical_blk = fm_extent->fe_logical >> blk_shift; - physical_blk = fm_extent->fe_physical >> blk_shift; + if (fm_extent->fe_flags & FIEMAP_EXTENT_UNKNOWN) { + physical_blk = 0; + } else { + physical_blk = fm_extent->fe_physical >> blk_shift; + } - if (expected) + if (device_offset) + sprintf(flags, "%04x: ", fm_extent->fe_device & 0xffff); + else if (expected && + !(fm_extent->fe_flags & FIEMAP_EXTENT_UNKNOWN) && + !(fm_extent->fe_flags & EXT4_FIEMAP_EXTENT_HOLE)) sprintf(flags, ext_fmt == hex_fmt ? "%*llx: " : "%*llu: ", physical_width, expected >> blk_shift); - else - sprintf(flags, "%.*s ", physical_width, " "); - - if (fm_extent->fe_flags & FIEMAP_EXTENT_UNKNOWN) - strcat(flags, "unknown,"); - if (fm_extent->fe_flags & FIEMAP_EXTENT_DELALLOC) - strcat(flags, "delalloc,"); - if (fm_extent->fe_flags & FIEMAP_EXTENT_DATA_ENCRYPTED) - strcat(flags, "encrypted,"); - if (fm_extent->fe_flags & FIEMAP_EXTENT_NOT_ALIGNED) - strcat(flags, "not_aligned,"); - if (fm_extent->fe_flags & FIEMAP_EXTENT_DATA_INLINE) - strcat(flags, "inline,"); - if (fm_extent->fe_flags & FIEMAP_EXTENT_DATA_TAIL) - strcat(flags, "tail_packed,"); - if (fm_extent->fe_flags & FIEMAP_EXTENT_UNWRITTEN) - strcat(flags, "unwritten,"); - if (fm_extent->fe_flags & FIEMAP_EXTENT_MERGED) - strcat(flags, "merged,"); - if (fm_extent->fe_logical + fm_extent->fe_length >= st->st_size) - strcat(flags, "eof,"); + print_flags(fm_extent->fe_flags, flags, sizeof(flags), 1); - /* Remove trailing comma, if any */ - if (flags[0]) - flags[strlen(flags) - 1] = '\0'; + if (fm_extent->fe_logical + fm_extent->fe_length >= + (unsigned long long)st->st_size) + strcat(flags, flags[0] ? ",eof" : "eof"); + + if ((fm_extent->fe_flags & FIEMAP_EXTENT_UNKNOWN) || + (fm_extent->fe_flags & EXT4_FIEMAP_EXTENT_HOLE)) { + ext_len = 0; + ext_blks_phys = 0; + } else + ext_blks_phys = ext_blks; printf(ext_fmt, cur_ex, logical_width, logical_blk, logical_width, logical_blk + ext_blks, physical_width, physical_blk, - physical_width, physical_blk + ext_blks, + physical_width, physical_blk + ext_blks_phys, ext_len, flags); } static int filefrag_fiemap(int fd, int blk_shift, int *num_extents, ext2fs_struct_stat *st) { - char buf[16384]; + __u64 buf[2048]; /* __u64 for proper field alignment */ struct fiemap *fiemap = (struct fiemap *)buf; struct fiemap_extent *fm_ext = &fiemap->fm_extents[0]; + struct fiemap_extent fm_last; int count = (sizeof(buf) - sizeof(*fiemap)) / sizeof(struct fiemap_extent); unsigned long long expected = 0; + unsigned long long expected_dense = 0; unsigned long flags = 0; unsigned int i; - static int fiemap_incompat_printed; + unsigned long cmd = FS_IOC_FIEMAP; int fiemap_header_printed = 0; int tot_extents = 0, n = 0; + int previous_device = -1; int last = 0; int rc; memset(fiemap, 0, sizeof(struct fiemap)); + memset(&fm_last, 0, sizeof(fm_last)); if (sync_file) flags |= FIEMAP_FLAG_SYNC; + if (precache_file) + flags |= FIEMAP_FLAG_CACHE; + if (xattr_map) flags |= FIEMAP_FLAG_XATTR; + if (use_extent_cache) + cmd = EXT4_IOC_GET_ES_CACHE; + + if (device_offset) { + flags |= FIEMAP_FLAG_DEVICE_ORDER; + memset(fm_ext, 0, sizeof(struct fiemap_extent)); + } + +retry_wo_device_order: do { fiemap->fm_length = ~0ULL; fiemap->fm_flags = flags; fiemap->fm_extent_count = count; - rc = ioctl(fd, FS_IOC_FIEMAP, (unsigned long) fiemap); + rc = ioctl(fd, cmd, (unsigned long) fiemap); if (rc < 0) { - if (errno == EBADR && fiemap_incompat_printed == 0) { - printf("FIEMAP failed with unsupported " - "flags %x\n", fiemap->fm_flags); + static int fiemap_incompat_printed; + + rc = -errno; + if (rc == -EBADR && !fiemap_incompat_printed) { + fprintf(stderr, "FIEMAP failed with unknown " + "flags %x\n", + fiemap->fm_flags); fiemap_incompat_printed = 1; + } else if (rc == EBADR && (fiemap->fm_flags & + FIEMAP_FLAG_DEVICE_ORDER)) { + flags &= ~FIEMAP_FLAG_DEVICE_ORDER; + goto retry_wo_device_order; } return rc; } @@ -229,8 +305,14 @@ static int filefrag_fiemap(int fd, int blk_shift, int *num_extents, } for (i = 0; i < fiemap->fm_mapped_extents; i++) { - if (fm_ext[i].fe_logical != 0 && - fm_ext[i].fe_physical != expected) { + expected_dense = fm_last.fe_physical + + fm_last.fe_length; + expected = fm_last.fe_physical + + fm_ext[i].fe_logical - fm_last.fe_logical; + if ((fm_ext[i].fe_logical != 0 && + fm_ext[i].fe_physical != expected && + fm_ext[i].fe_physical != expected_dense) || + ((fm_ext[i].fe_device & 0xffff) != previous_device)) { tot_extents++; } else { expected = 0; @@ -240,15 +322,27 @@ static int filefrag_fiemap(int fd, int blk_shift, int *num_extents, if (verbose) print_extent_info(&fm_ext[i], n, expected, blk_shift, st); - - expected = fm_ext[i].fe_physical + fm_ext[i].fe_length; if (fm_ext[i].fe_flags & FIEMAP_EXTENT_LAST) last = 1; + fm_last = fm_ext[i]; n++; + previous_device = fm_ext[i].fe_device & 0xffff; } - fiemap->fm_start = (fm_ext[i - 1].fe_logical + - fm_ext[i - 1].fe_length); + /* For DEVICE_ORDER mappings, if EXTENT_LAST not yet found then + * fm_start needs to be the same as it was for earlier ioctl. + * The first extent is used to pass the end offset and device + * of the last FIEMAP call. Otherwise, we ask for extents + * starting from where the last mapping ended. */ + if (flags & FIEMAP_FLAG_DEVICE_ORDER) { + fm_ext[0].fe_logical = fm_ext[i - 1].fe_logical + + fm_ext[i - 1].fe_length; + fm_ext[0].fe_device = fm_ext[i - 1].fe_device; + fiemap->fm_start = 0; + } else { + fiemap->fm_start = fm_ext[i - 1].fe_logical + + fm_ext[i - 1].fe_length; + } } while (last == 0); *num_extents = tot_extents; @@ -262,20 +356,22 @@ static int filefrag_fibmap(int fd, int blk_shift, int *num_extents, ext2fs_struct_stat *st, unsigned long numblocks, int is_ext2) { - struct fiemap_extent fm_ext; + struct fiemap_extent fm_ext, fm_last; unsigned long i, last_block; - unsigned long long logical; + unsigned long long logical, expected = 0; /* Blocks per indirect block */ const long bpib = st->st_blksize / 4; int count; + memset(&fm_ext, 0, sizeof(fm_ext)); + memset(&fm_last, 0, sizeof(fm_last)); if (force_extent) { - memset(&fm_ext, 0, sizeof(fm_ext)); + fm_ext.fe_device = st->st_dev; fm_ext.fe_flags = FIEMAP_EXTENT_MERGED; } - if (sync_file) - fsync(fd); + if (sync_file && fsync(fd) != 0) + return -errno; for (i = 0, logical = 0, *num_extents = 0, count = last_block = 0; i < numblocks; @@ -297,53 +393,70 @@ static int filefrag_fibmap(int fd, int blk_shift, int *num_extents, return rc; if (block == 0) continue; - if (*num_extents == 0) { - (*num_extents)++; - if (force_extent) { + + if (*num_extents == 0 || block != last_block + 1 || + fm_ext.fe_logical + fm_ext.fe_length != logical) { + /* + * This is the start of a new extent; figure out where + * we expected it to be and report the extent. + */ + if (*num_extents != 0 && fm_last.fe_length) { + expected = fm_last.fe_physical + + (fm_ext.fe_logical - fm_last.fe_logical); + if (expected == fm_ext.fe_physical) + expected = 0; + } + if (force_extent && *num_extents == 0) print_extent_header(); - fm_ext.fe_physical = block * st->st_blksize; + if (force_extent && *num_extents != 0) { + print_extent_info(&fm_ext, *num_extents - 1, + expected, blk_shift, st); } - } - count++; - if (force_extent && last_block != 0 && - (block != last_block + 1 || - fm_ext.fe_logical + fm_ext.fe_length != logical)) { - print_extent_info(&fm_ext, *num_extents - 1, - (last_block + 1) * st->st_blksize, - blk_shift, st); - fm_ext.fe_logical = logical; + if (verbose && expected != 0) { + printf("Discontinuity: Block %llu is at %llu " + "(was %llu)\n", + (unsigned long long) (fm_ext.fe_logical / st->st_blksize), + (unsigned long long) (fm_ext.fe_physical / st->st_blksize), + (unsigned long long) (expected / st->st_blksize)); + } + /* create the new extent */ + fm_last = fm_ext; + (*num_extents)++; fm_ext.fe_physical = block * st->st_blksize; + fm_ext.fe_logical = logical; fm_ext.fe_length = 0; - (*num_extents)++; - } else if (verbose && last_block && (block != last_block + 1)) { - printf("Discontinuity: Block %ld is at %lu (was %lu)\n", - i, block, last_block + 1); - (*num_extents)++; } fm_ext.fe_length += st->st_blksize; last_block = block; } - - if (force_extent) - print_extent_info(&fm_ext, *num_extents - 1, - last_block * st->st_blksize, blk_shift, st); + if (force_extent && *num_extents != 0) { + if (fm_last.fe_length) { + expected = fm_last.fe_physical + + (fm_ext.fe_logical - fm_last.fe_logical); + if (expected == fm_ext.fe_physical) + expected = 0; + } + print_extent_info(&fm_ext, *num_extents - 1, expected, + blk_shift, st); + } return count; } -static void frag_report(const char *filename) +static int frag_report(const char *filename) { static struct statfs fsinfo; + static unsigned int blksize; ext2fs_struct_stat st; int blk_shift; long fd; - unsigned long numblocks; + unsigned long long numblocks; int data_blocks_per_cyl = 1; int num_extents = 1, expected = ~0; int is_ext2 = 0; static dev_t last_device; - unsigned int flags; int width; + int rc = 0; #if defined(HAVE_OPEN64) && !defined(__OSX_AVAILABLE_BUT_DEPRECATED) fd = open64(filename, O_RDONLY); @@ -351,8 +464,9 @@ static void frag_report(const char *filename) fd = open(filename, O_RDONLY); #endif if (fd < 0) { + rc = -errno; perror("open"); - return; + return rc; } #if defined(HAVE_FSTAT64) && !defined(__OSX_AVAILABLE_BUT_DEPRECATED) @@ -360,71 +474,116 @@ static void frag_report(const char *filename) #else if (fstat(fd, &st) < 0) { #endif + rc = -errno; perror("stat"); - return; + goto out_close; } - if (last_device != st.st_dev) { + if ((last_device != st.st_dev) || !st.st_dev) { if (fstatfs(fd, &fsinfo) < 0) { + rc = -errno; perror("fstatfs"); - return; + goto out_close; } + if ((ioctl(fd, FIGETBSZ, &blksize) < 0) || !blksize) + blksize = fsinfo.f_bsize; if (verbose) printf("Filesystem type is: %lx\n", - (unsigned long) fsinfo.f_type); + (unsigned long)fsinfo.f_type); + } + st.st_blksize = blksize; + if (fsinfo.f_type == 0xef51 || fsinfo.f_type == 0xef52 || + fsinfo.f_type == 0xef53) { + unsigned int flags; + + if (ioctl(fd, EXT3_IOC_GETFLAGS, &flags) == 0 && + !(flags & EXT4_EXTENTS_FL)) + is_ext2 = 1; + } + + /* Check if filesystem is Lustre. Always print in extent format + * with 1kB blocks, using the device-relative logical offsets. */ + if (fsinfo.f_type == LUSTRE_SUPER_MAGIC) { + device_offset = 1; + blocksize = blocksize ?: 1024; } - st.st_blksize = fsinfo.f_bsize; - if (ioctl(fd, EXT3_IOC_GETFLAGS, &flags) < 0) - flags = 0; - if (!(flags & EXT4_EXTENTS_FL) && - ((fsinfo.f_type == 0xef51) || (fsinfo.f_type == 0xef52) || - (fsinfo.f_type == 0xef53))) - is_ext2++; if (is_ext2) { - long cylgroups = div_ceil(fsinfo.f_blocks, fsinfo.f_bsize * 8); + long cylgroups = div_ceil(fsinfo.f_blocks, blksize * 8); if (verbose && last_device != st.st_dev) printf("Filesystem cylinder groups approximately %ld\n", cylgroups); - data_blocks_per_cyl = fsinfo.f_bsize * 8 - + data_blocks_per_cyl = blksize * 8 - (fsinfo.f_files / 8 / cylgroups) - 3; } last_device = st.st_dev; - width = int_log10(fsinfo.f_blocks); + width = ulong_log10(fsinfo.f_blocks); if (width > physical_width) physical_width = width; - numblocks = (st.st_size + fsinfo.f_bsize - 1) / fsinfo.f_bsize; + numblocks = (st.st_size + blksize - 1) / blksize; if (blocksize != 0) - blk_shift = int_log2(blocksize); + blk_shift = ulong_log2(blocksize); else - blk_shift = int_log2(fsinfo.f_bsize); + blk_shift = ulong_log2(blksize); - width = int_log10(numblocks); + if (use_extent_cache) + width = 10; + else + width = ulong_log10(numblocks); if (width > logical_width) logical_width = width; - if (verbose) - printf("File size of %s is %llu (%lu block%s of %d bytes)\n", - filename, (unsigned long long)st.st_size, - numblocks * fsinfo.f_bsize >> blk_shift, + if (verbose) { + __u32 state; + + printf("File size of %s is %llu (%llu block%s of %d bytes)", + filename, (unsigned long long) st.st_size, + (unsigned long long) (numblocks * blksize >> blk_shift), numblocks == 1 ? "" : "s", 1 << blk_shift); + if (use_extent_cache && + ioctl(fd, EXT4_IOC_GETSTATE, &state) == 0 && + (state & EXT4_STATE_FLAG_EXT_PRECACHED)) + fputs(" -- pre-cached", stdout); + fputc('\n', stdout); + } - if (force_bmap || - filefrag_fiemap(fd, blk_shift, &num_extents, &st) != 0) { + if (!force_bmap) { + rc = filefrag_fiemap(fd, blk_shift, &num_extents, &st); + expected = 0; + if (rc < 0 && + (use_extent_cache || precache_file || xattr_map)) { + if (rc != -EBADR) + fprintf(stderr, "%s: %s: %s\n ", + filename, + use_extent_cache ? + "EXT4_IOC_GET_ES_CACHE" : + "FS_IOC_FIEMAP", strerror(-rc)); + goto out_close; + } + } + + if (force_bmap || rc < 0) { /* FIEMAP failed, try FIBMAP instead */ expected = filefrag_fibmap(fd, blk_shift, &num_extents, &st, numblocks, is_ext2); if (expected < 0) { - if (errno == EINVAL || errno == ENOTTY) { - fprintf(stderr, "%s: FIBMAP unsupported\n", + if (expected == -EINVAL || expected == -ENOTTY) { + fprintf(stderr, "%s: FIBMAP%s unsupported\n", + filename, force_bmap ? "" : "/FIEMAP"); + } else if (expected == -EPERM) { + fprintf(stderr, + "%s: FIBMAP requires root privileges\n", filename); - } else if (errno != EPERM) { + } else { fprintf(stderr, "%s: FIBMAP error: %s", - filename, strerror(errno)); + filename, strerror(expected)); } + rc = expected; goto out_close; + } else { + rc = 0; } expected = expected / data_blocks_per_cyl + 1; } @@ -441,11 +600,13 @@ static void frag_report(const char *filename) fputc('\n', stdout); out_close: close(fd); + + return rc; } static void usage(const char *progname) { - fprintf(stderr, "Usage: %s [-b{blocksize}] [-BeklsvxX] file ...\n", + fprintf(stderr, "Usage: %s [-b{blocksize}[KMG]] [-BeEksvxX] file ...\n", progname); exit(1); } @@ -453,35 +614,56 @@ static void usage(const char *progname) int main(int argc, char**argv) { char **cpp; - int c; + int rc = 0, c; + int version = 0; - while ((c = getopt(argc, argv, "Bb::eksvxX")) != EOF) + while ((c = getopt(argc, argv, "Bb::eEkPlsvxXV")) != EOF) { switch (c) { case 'B': force_bmap++; + force_extent = 0; break; case 'b': if (optarg) { char *end; - blocksize = strtoul(optarg, &end, 0); + unsigned long val; + + val = strtoul(optarg, &end, 0); if (end) { +#if __GNUC_PREREQ (7, 0) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#endif switch (end[0]) { case 'g': case 'G': - blocksize *= 1024; - /* no break */ + val *= 1024; + /* fall through */ case 'm': case 'M': - blocksize *= 1024; - /* no break */ + val *= 1024; + /* fall through */ case 'k': case 'K': - blocksize *= 1024; + val *= 1024; break; default: break; } +#if __GNUC_PREREQ (7, 0) +#pragma GCC diagnostic pop +#endif + } + /* Specifying too large a blocksize will just + * shift all extents down to zero length. Even + * 1GB is questionable, but caveat emptor. */ + if (val > 1024 * 1024 * 1024) { + fprintf(stderr, + "%s: blocksize %lu over 1GB\n", + argv[0], val); + usage(argv[0]); } + blocksize = val; } else { /* Allow -b without argument for compat. Remove * this eventually so "-b {blocksize}" works */ fprintf(stderr, "%s: -b needs a blocksize " @@ -490,6 +672,9 @@ int main(int argc, char**argv) blocksize = 1024; } break; + case 'E': + use_extent_cache++; + /* fallthrough */ case 'e': force_extent++; if (!verbose) @@ -498,12 +683,21 @@ int main(int argc, char**argv) case 'k': blocksize = 1024; break; + case 'P': + precache_file++; + break; + case 'l': + device_offset++; + break; case 's': sync_file++; break; case 'v': verbose++; break; + case 'V': + version++; + break; case 'x': xattr_map++; break; @@ -514,10 +708,29 @@ int main(int argc, char**argv) usage(argv[0]); break; } + } + if (version) { + /* Print version number and exit */ + printf("filefrag %s (%s)\n", E2FSPROGS_VERSION, E2FSPROGS_DATE); + if (version + verbose > 1) { + char flags[256] = ""; + + print_flags(0xffffffff, flags, sizeof(flags), 0); + printf("supported: %s\n", flags); + } + exit(0); + } + if (optind == argc) usage(argv[0]); - for (cpp=argv+optind; *cpp; cpp++) - frag_report(*cpp); - return 0; + + for (cpp = argv + optind; *cpp != NULL; cpp++) { + int rc2 = frag_report(*cpp); + + if (rc2 < 0 && rc == 0) + rc = rc2; + } + + return -rc; } #endif