From 0e91d91a899bd593ab935cc2a4d4ed9c1906a8a3 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Fri, 2 Nov 2007 05:48:14 +0000 Subject: [PATCH] Branch HEAD b=13568 i=adilger i=scjody Remove 2.4 kernel code from lustre/obdecho/echo_client.c. --- lustre/ChangeLog | 1 + lustre/obdecho/echo_client.c | 72 -------------------------------------------- 2 files changed, 1 insertion(+), 72 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index e1ec608..87be2c2 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -25,6 +25,7 @@ Details : Remove 2.5.0 check from quota_check.c, quota_ctl.c, subsystem. Remove 2.4 kernel check from filter.c, lproc_obdfilter.c in obdfilter subsystem. + Remove 2.4 kernel code from lustre/obdecho/echo_client.c. Severity : enhancement Bugzilla : 13690 diff --git a/lustre/obdecho/echo_client.c b/lustre/obdecho/echo_client.c index ef16000..c5d32ab 100644 --- a/lustre/obdecho/echo_client.c +++ b/lustre/obdecho/echo_client.c @@ -582,77 +582,6 @@ static int echo_client_kbrw(struct obd_device *obd, int rw, struct obdo *oa, } #ifdef __KERNEL__ -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -#include - -static int echo_client_ubrw(struct obd_device *obd, int rw, - struct obdo *oa, struct lov_stripe_md *lsm, - obd_off offset, obd_size count, char *buffer, - struct obd_trans_info *oti) -{ - struct echo_client_obd *ec = &obd->u.echo_client; - struct obd_info oinfo = { { { 0 } } }; - obd_count npages; - struct brw_page *pga; - struct brw_page *pgp; - obd_off off; - struct kiobuf *kiobuf; - int i; - int rc; - - LASSERT (rw == OBD_BRW_WRITE || rw == OBD_BRW_READ); - - /* NB: for now, only whole pages, page aligned */ - - if (count <= 0 || - ((long)buffer & (~CFS_PAGE_MASK)) != 0 || - (count & (~CFS_PAGE_MASK)) != 0 || - (lsm != NULL && lsm->lsm_object_id != oa->o_id)) - return (-EINVAL); - - /* XXX think again with misaligned I/O */ - npages = count >> CFS_PAGE_SHIFT; - - OBD_ALLOC(pga, npages * sizeof(*pga)); - if (pga == NULL) - return (-ENOMEM); - - rc = alloc_kiovec (1, &kiobuf); - if (rc != 0) - goto out_1; - - rc = map_user_kiobuf ((rw == OBD_BRW_READ) ? READ : WRITE, - kiobuf, (unsigned long)buffer, count); - if (rc != 0) - goto out_2; - - LASSERT (kiobuf->offset == 0); - LASSERT (kiobuf->nr_pages == npages); - - for (i = 0, off = offset, pgp = pga; - i < npages; - i++, off += CFS_PAGE_SIZE, pgp++) { - pgp->off = off; - pgp->pg = kiobuf->maplist[i]; - pgp->count = CFS_PAGE_SIZE; - pgp->flag = 0; - } - - oinfo.oi_oa = oa; - oinfo.oi_md = lsm; - rc = obd_brw(rw, ec->ec_exp, &oinfo, npages, pga, oti); - - // if (rw == OBD_BRW_READ) - // mark_dirty_kiobuf (kiobuf, count); - - unmap_kiobuf (kiobuf); - out_2: - free_kiovec (1, &kiobuf); - out_1: - OBD_FREE(pga, npages * sizeof(*pga)); - return (rc); -} -#else static int echo_client_ubrw(struct obd_device *obd, int rw, struct obdo *oa, struct lov_stripe_md *lsm, obd_off offset, obd_size count, char *buffer, @@ -663,7 +592,6 @@ static int echo_client_ubrw(struct obd_device *obd, int rw, return 0; } #endif -#endif struct echo_async_state; -- 1.8.3.1