From 71d01ad7b327d37bb1a6c288d753fbd6d033f76f Mon Sep 17 00:00:00 2001 From: zab Date: Tue, 27 May 2003 01:25:13 +0000 Subject: [PATCH] get b_ad compiling after the b_devel merge. - move the possibly broken waitfor_one_page to one place - o_mtime is seconds, that's what ll_ts2u64 returns. s/%Lu/LPU64/ - get rid of client_tgt2uuid2obd copies, export it from obdclass - move client_obd_{setup,cleanup} into obdclass, export, kill dupes - remove empty ptlrpc_lib - get rid of random sanobd dupe in lov - hoist ll_alloc_brw out of a kernel version ifdef - no, seriously, unsigned long flags. --- lustre/ldlm/Makefile.mk | 2 +- lustre/llite/llite_lib.c | 7 ++++--- lustre/mdc/Makefile.mk | 2 +- lustre/osc/Makefile.mk | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lustre/ldlm/Makefile.mk b/lustre/ldlm/Makefile.mk index 9855652..04402a7 100644 --- a/lustre/ldlm/Makefile.mk +++ b/lustre/ldlm/Makefile.mk @@ -7,4 +7,4 @@ include $(src)/../portals/Kernelenv obj-y += ldlm.o ldlm-objs := l_lock.o ldlm_lock.o ldlm_resource.o ldlm_extent.o ldlm_request.o \ - ldlm_lockd.o + ldlm_lockd.o ldlm_lib.o diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 6dfb409..8148fa1 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -372,8 +372,9 @@ int ll_inode_setattr(struct inode *inode, struct iattr *attr, int do_trunc) struct obdo oa; int err2; - CDEBUG(D_INODE, "set mtime on OST inode %lu to %Lu\n", - inode->i_ino, ll_ts2u64(&attr->ia_mtime)); + CDEBUG(D_INODE, "set mtime on OST inode %lu to " + LPU64"\n", inode->i_ino, + ll_ts2u64(&attr->ia_mtime)); oa.o_id = lsm->lsm_object_id; oa.o_mode = S_IFREG; oa.o_valid = OBD_MD_FLID |OBD_MD_FLTYPE |OBD_MD_FLMTIME; @@ -462,7 +463,7 @@ skip_extent_lock: struct obdo oa; int err2; - CDEBUG(D_INODE, "set mtime on OST inode %lu to %Lu\n", + CDEBUG(D_INODE, "set mtime on OST inode %lu to "LPU64"\n", inode->i_ino, ll_ts2u64(&attr->ia_mtime)); oa.o_id = lsm->lsm_object_id; oa.o_mode = S_IFREG; diff --git a/lustre/mdc/Makefile.mk b/lustre/mdc/Makefile.mk index 3fba39c..b12e5fc 100644 --- a/lustre/mdc/Makefile.mk +++ b/lustre/mdc/Makefile.mk @@ -6,4 +6,4 @@ include $(src)/../portals/Kernelenv obj-y += mdc.o -mdc-objs := mdc_request.o mdc_reint.o lproc_mdc.o +mdc-objs := mdc_request.o mdc_reint.o lproc_mdc.o mdc_lib.o diff --git a/lustre/osc/Makefile.mk b/lustre/osc/Makefile.mk index 1d1efb0..28c694a 100644 --- a/lustre/osc/Makefile.mk +++ b/lustre/osc/Makefile.mk @@ -6,4 +6,4 @@ include $(src)/../portals/Kernelenv obj-y += osc.o -osc-objs := osc_request.o lproc_osc.o +osc-objs := osc_request.o lproc_osc.o osc_lib.o -- 1.8.3.1