X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fliblustre%2Ftests%2Fsanity.c;h=21deed3a2d645ed639a52153d546b034ef18cf28;hb=fc75c4b4f597f095fc16d6119427f17f0d8e2a85;hp=b9f05337d2708e538753269d6e9d250958edc21f;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70;p=fs%2Flustre-release.git diff --git a/lustre/liblustre/tests/sanity.c b/lustre/liblustre/tests/sanity.c index b9f0533..21deed3 100644 --- a/lustre/liblustre/tests/sanity.c +++ b/lustre/liblustre/tests/sanity.c @@ -26,6 +26,8 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -56,7 +58,7 @@ #include #include "test_common.h" -#include +#include #define _npages (2048) @@ -394,7 +396,7 @@ int t14(char *name) char buf[1024]; const int nfiles = 256; char *prefix = "test14_filename_long_prefix_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA___"; - cfs_dirent_t *ent; + struct dirent64 *ent; int fd, i, rc, pos, index; loff_t base = 0; ENTER(">1 block(4k) directory readdir"); @@ -898,14 +900,14 @@ static int pages_io(int xfer, loff_t pos) /* create sample data */ for (i = 0, buf = buf_alloc; i < _npages; i++) { - for (j = 0; j < CFS_PAGE_SIZE/sizeof(int); j++, buf++) { + for (j = 0; j < PAGE_CACHE_SIZE/sizeof(int); j++, buf++) { *buf = rand(); } } /* compute checksum */ for (i = 0, buf = buf_alloc; i < _npages; i++) { - for (j = 0; j < CFS_PAGE_SIZE/sizeof(int); j++, buf++) { + for (j = 0; j < PAGE_CACHE_SIZE/sizeof(int); j++, buf++) { check_sum[i] += *buf; } } @@ -923,9 +925,9 @@ static int pages_io(int xfer, loff_t pos) } gettimeofday(&tw1, NULL); for (i = 0, buf = buf_alloc; i < _npages; - i += xfer, buf += xfer * CFS_PAGE_SIZE / sizeof(int)) { - rc = write(fd, buf, CFS_PAGE_SIZE * xfer); - if (rc != CFS_PAGE_SIZE * xfer) { + i += xfer, buf += xfer * PAGE_CACHE_SIZE / sizeof(int)) { + rc = write(fd, buf, PAGE_CACHE_SIZE * xfer); + if (rc != PAGE_CACHE_SIZE * xfer) { printf("write error (i %d, rc %d): %s\n", i, rc, strerror(errno)); return(1); @@ -943,9 +945,9 @@ static int pages_io(int xfer, loff_t pos) } gettimeofday(&tr1, NULL); for (i = 0, buf = buf_alloc; i < _npages; - i += xfer, buf += xfer * CFS_PAGE_SIZE / sizeof(int)) { - rc = read(fd, buf, CFS_PAGE_SIZE * xfer); - if (rc != CFS_PAGE_SIZE * xfer) { + i += xfer, buf += xfer * PAGE_CACHE_SIZE / sizeof(int)) { + rc = read(fd, buf, PAGE_CACHE_SIZE * xfer); + if (rc != PAGE_CACHE_SIZE * xfer) { printf("read error (i %d, rc %d): %s\n", i, rc, strerror(errno)); return(1); @@ -956,7 +958,7 @@ static int pages_io(int xfer, loff_t pos) /* compute checksum */ for (i = 0, buf = buf_alloc; i < _npages; i++) { int sum = 0; - for (j = 0; j < CFS_PAGE_SIZE/sizeof(int); j++, buf++) { + for (j = 0; j < PAGE_CACHE_SIZE/sizeof(int); j++, buf++) { sum += *buf; } if (sum != check_sum[i]) { @@ -971,8 +973,8 @@ static int pages_io(int xfer, loff_t pos) tw = (tw2.tv_sec - tw1.tv_sec) * 1000000 + (tw2.tv_usec - tw1.tv_usec); tr = (tr2.tv_sec - tr1.tv_sec) * 1000000 + (tr2.tv_usec - tr1.tv_usec); printf(" (R:%.3fM/s, W:%.3fM/s)\n", - (_npages * CFS_PAGE_SIZE) / (tw / 1000000.0) / (1024 * 1024), - (_npages * CFS_PAGE_SIZE) / (tr / 1000000.0) / (1024 * 1024)); + (_npages * PAGE_CACHE_SIZE) / (tw / 1000000.0) / (1024 * 1024), + (_npages * PAGE_CACHE_SIZE) / (tr / 1000000.0) / (1024 * 1024)); if (data_error) return 1; @@ -1255,21 +1257,23 @@ int t55(char *name) close(fd); if (opt_verbose) { - printf("lmm_magic: 0x%08X\n", lum->lmm_magic); - printf("lmm_object_id: "LPX64"\n", lum->lmm_object_id); - printf("lmm_object_seq: "LPX64"\n", lum->lmm_object_seq); - printf("lmm_stripe_count: %u\n", (int)lum->lmm_stripe_count); - printf("lmm_stripe_size: %u\n", lum->lmm_stripe_size); - printf("lmm_stripe_pattern: %x\n", lum->lmm_pattern); - - for (index = 0; index < lum->lmm_stripe_count; index++) { - lo = lum->lmm_objects + index; - printf("object %d:\n", index); - printf("\tobject_seq: "LPX64"\n", lo->l_object_seq); - printf("\tobject_id: "LPX64"\n", lo->l_object_id); - printf("\tost_gen: %#x\n", lo->l_ost_gen); - printf("\tost_idx: %u\n", lo->l_ost_idx); - } + printf("lmm_magic: 0x%08X\n", lum->lmm_magic); + printf("lmm_object_id: "LPX64"\n", + lmm_oi_id(&lum->lmm_oi)); + printf("lmm_object_seq: "LPX64"\n", + lmm_oi_seq(&lum->lmm_oi)); + printf("lmm_stripe_count: %u\n", (int)lum->lmm_stripe_count); + printf("lmm_stripe_size: %u\n", lum->lmm_stripe_size); + printf("lmm_stripe_pattern: %x\n", lum->lmm_pattern); + + for (index = 0; index < lum->lmm_stripe_count; index++) { + lo = lum->lmm_objects + index; + printf("object %d:\n", index); + printf("\tobject_oid: "DOSTID"\n", + POSTID(&lo->l_ost_oi)); + printf("\tost_gen: %#x\n", lo->l_ost_gen); + printf("\tost_idx: %u\n", lo->l_ost_idx); + } } if (lum->lmm_magic != LOV_USER_MAGIC || @@ -1320,22 +1324,24 @@ int t55(char *name) } close(fd); - if (opt_verbose) { - printf("lmm_magic: 0x%08X\n", lum->lmm_magic); - printf("lmm_object_id: "LPX64"\n", lum->lmm_object_id); - printf("lmm_object_seq: "LPX64"\n", lum->lmm_object_seq); - printf("lmm_stripe_count: %u\n", (int)lum->lmm_stripe_count); - printf("lmm_stripe_size: %u\n", lum->lmm_stripe_size); - printf("lmm_stripe_pattern: %x\n", lum->lmm_pattern); - - for (index = 0; index < lum->lmm_stripe_count; index++) { - lo = lum->lmm_objects + index; - printf("object %d:\n", index); - printf("\tobject_seq: "LPX64"\n", lo->l_object_seq); - printf("\tobject_id: "LPX64"\n", lo->l_object_id); - printf("\tost_gen: %#x\n", lo->l_ost_gen); - printf("\tost_idx: %u\n", lo->l_ost_idx); - } + if (opt_verbose) { + printf("lmm_magic: 0x%08X\n", lum->lmm_magic); + printf("lmm_object_id: "LPX64"\n", + lmm_oi_id(&lum->lmm_oi)); + printf("lmm_object_seq: "LPX64"\n", + lmm_oi_seq(&lum->lmm_oi)); + printf("lmm_stripe_count: %u\n", (int)lum->lmm_stripe_count); + printf("lmm_stripe_size: %u\n", lum->lmm_stripe_size); + printf("lmm_stripe_pattern: %x\n", lum->lmm_pattern); + + for (index = 0; index < lum->lmm_stripe_count; index++) { + lo = lum->lmm_objects + index; + printf("object %d:\n", index); + printf("\tobject_oid: "DOSTID"\n", + POSTID(&lo->l_ost_oi)); + printf("\tost_gen: %#x\n", lo->l_ost_gen); + printf("\tost_idx: %u\n", lo->l_ost_idx); + } } if (lum->lmm_magic != LOV_USER_MAGIC || @@ -1363,11 +1369,11 @@ int t55(char *name) */ int t56(char *name) { - int fd; - size_t nbytes; - off_t basep = 0; - long rc = 0; - cfs_dirent_t dir; + int fd; + size_t nbytes; + off_t basep = 0; + long rc = 0; + struct dirent64 dir; ENTER("getdirentries should fail if nbytes is too small"); @@ -1501,7 +1507,7 @@ int main(int argc, char * const argv[]) __liblustre_setup_(); - buf_size = _npages * CFS_PAGE_SIZE; + buf_size = _npages * PAGE_CACHE_SIZE; if (opt_verbose) printf("allocating %d bytes buffer\n", buf_size); buf_alloc = calloc(1, buf_size);