From 58ae902a158ea7932a633c23de29f601fdc30025 Mon Sep 17 00:00:00 2001 From: ericm Date: Sun, 15 Feb 2004 14:31:50 +0000 Subject: [PATCH] remove the ancient workaround for liblustre in osc_announce_cached(). Andreas: I tested that OST will never grant more space to liblustre than the initial 4M. --- lustre/liblustre/tests/sanity.c | 6 +++--- lustre/osc/osc_request.c | 7 +------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lustre/liblustre/tests/sanity.c b/lustre/liblustre/tests/sanity.c index 391dd3d..664be40 100644 --- a/lustre/liblustre/tests/sanity.c +++ b/lustre/liblustre/tests/sanity.c @@ -103,7 +103,7 @@ void t4() } #define PAGE_SIZE (4096) -#define _npages (512) +#define _npages (2048) static int _buffer[_npages][PAGE_SIZE/sizeof(int)]; @@ -145,7 +145,7 @@ static void pages_io(int xfer, loff_t pos) exit(1); } } - printf("succefully write %d pages\n", _npages); + printf("succefully write %d pages(%d per xfer)\n", _npages, xfer); memset(_buffer, 0, sizeof(_buffer)); @@ -158,7 +158,7 @@ static void pages_io(int xfer, loff_t pos) exit(1); } } - printf("succefully read %d pages\n", _npages); + printf("succefully read %d pages(%d per xfer)\n", _npages, xfer); /* compute checksum */ for (i = 0; i < _npages; i++) { diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index 666de06..38cba81 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -537,12 +537,7 @@ static void osc_announce_cached(struct client_obd *cli, struct obdo *oa, { obd_flag bits = OBD_MD_FLBLOCKS|OBD_MD_FLGRANT; - /* XXX obd_brw_internal() might reuse obdo in it's loop thus - * hit the following assert. any actual meaning of this? temporarily - * disable it. - * in kernel mode, probably VFS will prevent it happen. - */ - //LASSERT(!(oa->o_valid & bits)); + LASSERT(!(oa->o_valid & bits)); oa->o_valid |= bits; spin_lock(&cli->cl_loi_list_lock); -- 1.8.3.1