From: adilger Date: Wed, 9 Jul 2008 00:03:31 +0000 (+0000) Subject: Merge b1_8_gate from b1_6 (20080708_1553) X-Git-Tag: v1_7_0_51~2^24~1 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=6197d3bd6e41509a9e3f8be40f0577245ca8f71b;p=fs%2Flustre-release.git Merge b1_8_gate from b1_6 (20080708_1553) Mostly minor cleanups. Make ChangeLog consistent. Bump build version to v1_7_51. --- diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c index 0e7466b..e79fa25 100644 --- a/lustre/llite/rw.c +++ b/lustre/llite/rw.c @@ -325,9 +325,6 @@ static int ll_ap_make_ready(void *data, int cmd) llap = LLAP_FROM_COOKIE(data); page = llap->llap_page; - LASSERTF(!(cmd & OBD_BRW_READ), "cmd %x page %p ino %lu index %lu\n", cmd, page, - page->mapping->host->i_ino, page->index); - /* we're trying to write, but the page is locked.. come back later */ if (TryLockPage(page)) RETURN(-EAGAIN);