From: Dave Chinner <dchinner@xxxxxxxxxx> The built binary is not used by any test. Remove the dead code. Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> --- .gitignore | 1 - src/Makefile | 2 +- src/bulkstat_unlink_test_modified.c | 193 ---------------------------- 3 files changed, 1 insertion(+), 195 deletions(-) delete mode 100644 src/bulkstat_unlink_test_modified.c diff --git a/.gitignore b/.gitignore index 4fd817243..feb011c46 100644 --- a/.gitignore +++ b/.gitignore @@ -65,7 +65,6 @@ tags /src/btrfs_encoded_write /src/bulkstat_null_ocount /src/bulkstat_unlink_test -/src/bulkstat_unlink_test_modified /src/checkpoint_journal /src/chprojid_fail /src/cloner diff --git a/src/Makefile b/src/Makefile index 6ac72b366..6a31ceb01 100644 --- a/src/Makefile +++ b/src/Makefile @@ -26,7 +26,7 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \ locktest unwritten_mmap bulkstat_unlink_test deduperace \ - bulkstat_unlink_test_modified t_dir_offset t_futimens t_immutable \ + t_dir_offset t_futimens t_immutable \ stale_handle pwrite_mmap_blocked t_dir_offset2 seek_sanity_test \ seek_copy_test t_readdir_1 t_readdir_2 fsync-tester nsexec cloner \ renameat2 t_getcwd e4compact test-nextquota punch-alternating \ diff --git a/src/bulkstat_unlink_test_modified.c b/src/bulkstat_unlink_test_modified.c deleted file mode 100644 index a106749dc..000000000 --- a/src/bulkstat_unlink_test_modified.c +++ /dev/null @@ -1,193 +0,0 @@ -/* - * $Id: bulkstat_unlink_test_modified.c,v 1.1 2007/10/03 16:23:57 mohamedb.longdrop.melbourne.sgi.com Exp $ - * Test bulkstat doesn't returned unlinked inodes. - * Mark Goodwin <markgw@xxxxxxx> Fri Jul 20 09:13:57 EST 2007 - * - * This is a modified version of bulkstat_unlink_test.c to reproduce a specific - * problem see pv 969192 - */ -#include <stdlib.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <xfs/xfs.h> -#include <unistd.h> -#include <string.h> - -int -main(int argc, char *argv[]) -{ - int e; - int fd = 0; - int i; - int j; - int k; - int nfiles; - int stride; - struct stat sbuf; - ino_t *inodelist; - __u32 *genlist; - struct xfs_fsop_bulkreq a; - struct xfs_bstat *ret; - int iterations; - char fname[MAXPATHLEN]; - char *dirname; - - if (argc != 5) { - fprintf(stderr, "Usage: %s iterations nfiles stride dir\n", argv[0]); - fprintf(stderr, "Create dir with nfiles, unlink each stride'th file, sync, bulkstat\n"); - exit(1); - } - - iterations = atoi(argv[1]); - nfiles = atoi(argv[2]); - stride = atoi(argv[3]); - dirname = argv[4]; - if (!nfiles || !iterations) { - fprintf(stderr, "Iterations and nfiles showld be non zero.\n"); - exit(1); - } - - inodelist = (ino_t *)malloc(nfiles * sizeof(ino_t)); - genlist = (__u32 *)malloc(nfiles * sizeof(__u32)); - ret = (struct xfs_bstat *)malloc(nfiles * sizeof(struct xfs_bstat)); - - for (k=0; k < iterations; k++) { - xfs_ino_t last_inode = 0; - int count = 0; - int testFiles = 0; - - printf("Iteration %d ... \n", k); - - memset(inodelist, 0, nfiles * sizeof(ino_t)); - memset(genlist, 0, nfiles * sizeof(__u32)); - memset(ret, 0, nfiles * sizeof(struct xfs_bstat)); - memset(&a, 0, sizeof(struct xfs_fsop_bulkreq)); - a.lastip = (__u64 *)&last_inode; - a.icount = nfiles; - a.ubuffer = ret; - a.ocount = &count; - - if (mkdir(dirname, 0755) < 0) { - perror(dirname); - exit(1); - } - - /* create nfiles and store their inode numbers in inodelist */ - for (i=0; i < nfiles; i++) { - sprintf(fname, "%s/file%06d", dirname, i); - if ((fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644)) < 0) { - perror(fname); - exit(1); - } - write(fd, fname, sizeof(fname)); - if (fstat(fd, &sbuf) < 0) { - perror(fname); - exit(1); - } - inodelist[i] = sbuf.st_ino; - close(fd); - } - - sync(); - - /* collect bs_gen for the nfiles files */ - if ((fd = open(dirname, O_RDONLY)) < 0) { - perror(dirname); - exit(1); - } - - testFiles = 0; - for (;;) { - if ((e = xfsctl(dirname, fd, XFS_IOC_FSBULKSTAT, &a)) < 0) { - perror("XFS_IOC_FSBULKSTAT1:"); - exit(1); - } - - if (count == 0) - break; - - for (i=0; i < count; i++) { - for (j=0; j < nfiles; j += stride) { - if (ret[i].bs_ino == inodelist[j]) { - genlist[j] = ret[i].bs_gen; - testFiles++; - } - } - } - } - close(fd); - - printf("testFiles %d ... \n", testFiles); - - /* remove some of the first set of files */ - for (i=0; i < nfiles; i += stride) { - sprintf(fname, "%s/file%06d", dirname, i); - if (unlink(fname) < 0) { - perror(fname); - exit(1); - } - } - - /* create a new set of files (replacing the unlinked ones) */ - for (i=0; i < nfiles; i += stride) { - sprintf(fname, "%s/file%06d", dirname, i); - if ((fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644)) < 0) { - perror(fname); - exit(1); - } - write(fd, fname, sizeof(fname)); - close(fd); - } - - sync(); - last_inode = 0; count = 0; - - if ((fd = open(dirname, O_RDONLY)) < 0) { - perror(dirname); - exit(1); - } - - for (;;) { - if ((e = xfsctl(dirname, fd, XFS_IOC_FSBULKSTAT, &a)) < 0) { - perror("XFS_IOC_FSBULKSTAT:"); - exit(1); - } - - if (count == 0) - break; - - for (i=0; i < count; i++) { - for (j=0; j < nfiles; j += stride) { - if ((ret[i].bs_ino == inodelist[j]) && - (ret[i].bs_gen == genlist[j])) { - /* oops, the same inode with old gen number */ - printf("Unlinked inode %llu with generation %d " - "returned by bulkstat\n", - (unsigned long long)inodelist[j], - genlist[j]); - exit(1); - } - if (ret[i].bs_ino == inodelist[j] && - ret[i].bs_gen != genlist[j] + 1) { - /* oops, the new gen number is not 1 bigger than the old */ - printf("Inode with old generation %d, new generation %d\n", - genlist[j], ret[i].bs_gen); - exit(1); - } - } - } - } - - close(fd); - - sprintf(fname, "rm -rf %s\n", dirname); - system(fname); - - sync(); - sleep(2); - printf("passed\n"); - } - - exit(0); -} -- 2.45.2