From bea25e489ccdb44d1213de8a5b47a0ae48be61c0 Mon Sep 17 00:00:00 2001 From: adilger Date: Wed, 29 May 2002 18:23:18 +0000 Subject: [PATCH] Make mds_ext3.c and mds_extN.c build when no journal callback patch applied. --- lustre/mds/mds_ext3.c | 3 ++- lustre/mds/mds_extN.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lustre/mds/mds_ext3.c b/lustre/mds/mds_ext3.c index 5607345..cc616a4 100644 --- a/lustre/mds/mds_ext3.c +++ b/lustre/mds/mds_ext3.c @@ -220,7 +220,8 @@ static int mds_ext3_set_last_rcvd(struct mds_obd *mds, void *handle) (unsigned long long)mcb->cb_last_rcvd); journal_callback_set(handle, mds_ext3_callback_status, (struct journal_callback *)mcb); -#elif HAVE_JOURNAL_CALLBACK /* XXX original patch version - remove soon */ +#elif defined(HAVE_JOURNAL_CALLBACK) + /* XXX original patch version - remove soon */ #warning "using old journal callback kernel patch, please update" CDEBUG(D_EXT2, "set callback for last_rcvd: %Ld\n", (unsigned long long)mcb->cb_last_rcvd); diff --git a/lustre/mds/mds_extN.c b/lustre/mds/mds_extN.c index ee11330..bab6593 100644 --- a/lustre/mds/mds_extN.c +++ b/lustre/mds/mds_extN.c @@ -251,7 +251,8 @@ static int mds_extN_set_last_rcvd(struct mds_obd *mds, void *handle) (unsigned long long)mcb->cb_last_rcvd); journal_callback_set(handle, mds_extN_callback_status, (struct journal_callback *)mcb); -#elif HAVE_JOURNAL_CALLBACK /* XXX original patch version - remove soon */ +#elif defined(HAVE_JOURNAL_CALLBACK) + /* XXX original patch version - remove soon */ #warning "using old journal callback kernel patch, please update" CDEBUG(D_EXT2, "set callback for last_rcvd: %Ld\n", (unsigned long long)mcb->cb_last_rcvd); -- 1.8.3.1