From e8d60565d3cfd8f77a8919f2e62dcc5d3e61f24a Mon Sep 17 00:00:00 2001 From: adilger Date: Fri, 5 Mar 2004 18:10:38 +0000 Subject: [PATCH] Merge documentation, liblustre, obdecho, smfs changes that landed on HEAD after b1_2 was branched to avoid merge problems later. Things not yet landed from this period: - bug 2308 changes to portals (including kiov changes all over the place) - GMNAL updates from llp2 (mixed in with 2308) Those will be landed separately. --- lustre/obdecho/echo_client.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lustre/obdecho/echo_client.c b/lustre/obdecho/echo_client.c index 2dba463..136d357 100644 --- a/lustre/obdecho/echo_client.c +++ b/lustre/obdecho/echo_client.c @@ -949,14 +949,19 @@ static int echo_client_prep_commit(struct obd_export *exp, int rw, if (page == NULL && lnb[i].rc == 0) continue; + if (oa->o_id == ECHO_PERSISTENT_OBJID) + continue; + if (rw == OBD_BRW_WRITE) - echo_page_debug_setup(lsm, page, rw, oa->o_id, - rnb[i].offset, - rnb[i].len); + echo_client_page_debug_setup(lsm, page, rw, + oa->o_id, + rnb[i].offset, + rnb[i].len); else - echo_page_debug_check(lsm, page, oa->o_id, - rnb[i].offset, - rnb[i].len); + echo_client_page_debug_check(lsm, page, + oa->o_id, + rnb[i].offset, + rnb[i].len); } ret = obd_commitrw(rw, exp, oa, 1, &ioo, npages, lnb, oti, ret); -- 1.8.3.1