From: pschwan <pschwan>
Date: Thu, 10 Jul 2003 18:43:26 +0000 (+0000)
Subject: this is a large portion of the outstanding changes on b_ad, almost all
X-Git-Tag: v1_7_100~1^90~31
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=4cb9592afdd6ab261974305b1c8e0882b854eae9;p=fs%2Flustre-release.git

this is a large portion of the outstanding changes on b_ad, almost all
of which look trivial and readily acceptable to b_devel.  landing
first on b_unify to fix a few bugs and test more heavily
---

diff --git a/lustre/obdfilter/filter_san.c b/lustre/obdfilter/filter_san.c
index c535ccc..5345957 100644
--- a/lustre/obdfilter/filter_san.c
+++ b/lustre/obdfilter/filter_san.c
@@ -75,7 +75,11 @@ int filter_san_preprw(int cmd, struct lustre_handle *conn, int objcount,
         for (i = 0; i < objcount; i++, o++) {
                 struct dentry *dentry;
                 struct inode *inode;
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+                sector_t (*fs_bmap)(struct address_space *, sector_t);
+#else
                 int (*fs_bmap)(struct address_space *, long);
+#endif
                 int j;
 
                 dentry = filter_fid2dentry(obd, NULL, o->ioo_type, o->ioo_id);