Branch b1_8

b=18668

i=adilger, johann

Remove the AS_TR_CPP macro to avoid autoconf compatiblity issue.

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index ac22f63..7f3c679 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -1851,7 +1851,9 @@ int filter_common_setup(struct obd_device *obd, obd_count len, void *buf,
         __u8 *uuid_ptr;
         char *str, *label;
         char ns_name[48];
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
         struct request_queue *q;
+#endif
         int rc;
         ENTRY;
 
@@ -1964,6 +1966,7 @@ int filter_common_setup(struct obd_device *obd, obd_count len, void *buf,
         if (rc)
                 GOTO(err_post, rc);
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
         q = bdev_get_queue(mnt->mnt_sb->s_bdev);
         if (q->max_sectors < q->max_hw_sectors &&
             q->max_sectors < PTLRPC_MAX_BRW_SIZE >> 9)
@@ -1972,6 +1975,7 @@ int filter_common_setup(struct obd_device *obd, obd_count len, void *buf,
                               "could be up to max_hw_sectors=%u\n",
                               obd->obd_name, mnt->mnt_sb->s_id,
                               q->max_sectors, q->max_hw_sectors);
+#endif
 
         uuid_ptr = fsfilt_uuid(obd, obd->u.obt.obt_sb);
         if (uuid_ptr != NULL) {