b=21592 include linux/fs.h only when sys/mount.h doesn't define BLKGETSIZE64

i=andreas.dilger
i=andrew.perepechko
i=sheng.yang

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index f3e0b55..5c11296 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -68,7 +68,9 @@
 /* libcfs.h is not really needed here, but on SLES10/PPC, fs.h includes idr.h which
  * requires BITS_PER_LONG to be defined */
 #include <libcfs/libcfs.h>
 /* libcfs.h is not really needed here, but on SLES10/PPC, fs.h includes idr.h which
  * requires BITS_PER_LONG to be defined */
 #include <libcfs/libcfs.h>

+#ifndef BLKGETSIZE64

 #include <linux/fs.h> /* for BLKGETSIZE64 */
 #include <linux/fs.h> /* for BLKGETSIZE64 */

+#endif

 #include <linux/version.h>
 #endif
 #include <lustre_disk.h>
 #include <linux/version.h>
 #endif
 #include <lustre_disk.h>