Branch b_release_1_8_1

b=19869

i=shadow, johann, tianzy

Cleanup for Werror flag enabled.

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index cabf217..1ecab6b 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -862,6 +862,8 @@ LC_QUOTA
 
 LB_CONFIG_MODULES
 
+LN_CONFIG_USERSPACE
+
 LB_PATH_DMU
 LB_PATH_LIBSYSIO
 LB_PATH_SNMP

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index e9f3915..4301227 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -1069,9 +1069,32 @@ AC_DEFINE(HAVE_SHOW_TASK, 1, [show_task is exported])
 ])
 ])
 
+# check kernel __u64 type
+AC_DEFUN([LN_KERN__U64_LONG_LONG],
+[AC_MSG_CHECKING([kernel __u64 is long long type])
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Werror"
+LB_LINUX_TRY_COMPILE([
+       #include <linux/types.h>
+       #include <linux/stddef.h>
+],[
+       unsigned long long *data1;
+       __u64 *data2 = NULL;
+               
+       data1 = data2;
+],[
+       AC_MSG_RESULT([yes])
+        AC_DEFINE(HAVE_KERN__U64_LONG_LONG, 1,
+                  [kernel __u64 is long long type])
+],[
+       AC_MSG_RESULT([no])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+])
+
 # check userland __u64 type
-AC_DEFUN([LN_U64_LONG_LONG],
-[AC_MSG_CHECKING([__u64 is long long type])
+AC_DEFUN([LN_USER__U64_LONG_LONG],
+[AC_MSG_CHECKING([userspace __u64 is long long type])
 tmp_flags="$CFLAGS"
 CFLAGS="$CFLAGS -Werror"
 AC_COMPILE_IFELSE([
@@ -1086,8 +1109,8 @@ AC_COMPILE_IFELSE([
        }
 ],[
        AC_MSG_RESULT([yes])
-        AC_DEFINE(HAVE_U64_LONG_LONG, 1,
-                  [__u64 is long long type])
+        AC_DEFINE(HAVE_USER__U64_LONG_LONG, 1,
+                  [userspace __u64 is long long type])
 ],[
        AC_MSG_RESULT([no])
 ])
@@ -1418,6 +1441,16 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
+#
+# LN_CONFIG_USERSPACE
+#
+#
+AC_DEFUN([LN_CONFIG_USERSPACE],
+[
+LN_USER__U64_LONG_LONG
+])
+
+#
 # LN_PROG_LINUX
 #
 # LNet linux kernel checks
@@ -1444,7 +1477,7 @@ LN_CONFIG_MX
 LN_STRUCT_PAGE_LIST
 LN_STRUCT_SIGHAND
 LN_FUNC_SHOW_TASK
-LN_U64_LONG_LONG
+LN_KERN__U64_LONG_LONG
 LN_SSIZE_T_LONG
 LN_SIZE_T_LONG
 LN_LE_TYPES

diff --git a/lnet/include/libcfs/linux/kp30.h b/lnet/include/libcfs/linux/kp30.h
index b1e1226..0431bab 100644 (file)
--- a/lnet/include/libcfs/linux/kp30.h
+++ b/lnet/include/libcfs/linux/kp30.h
@@ -382,7 +382,8 @@ extern int  lwt_snapshot (cycles_t *now, int *ncpu, int *total_size,
  #define _LWORDSIZE __WORDSIZE
 #endif
 
-#if defined(HAVE_U64_LONG_LONG)
+#if (defined(__KERNEL__) && defined(HAVE_KERN__U64_LONG_LONG)) || \
+    (!defined(__KERNEL__) && defined(HAVE_USER__U64_LONG_LONG))
 # define LPU64 "%Lu"
 # define LPD64 "%Ld"
 # define LPX64 "%#Lx"

diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index 4c75139..01de36a 100644 (file)
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -392,7 +392,7 @@ static int ll_ap_make_ready(void *data, int cmd)
 
         LASSERTF(!(cmd & OBD_BRW_READ) || !PageWriteback(page),
                 "cmd %x page %p ino %lu index %lu fl %lx\n", cmd, page,
-                 page->mapping->host->i_ino, page->index, page->flags);
+                 page->mapping->host->i_ino, page->index, (long)page->flags);
 
         /* if we left PageDirty we might get another writepage call
          * in the future.  list walkers are bright enough

diff --git a/lustre/lov/lov_pack.c b/lustre/lov/lov_pack.c
index 7cca175..df6f3c5 100644 (file)
--- a/lustre/lov/lov_pack.c
+++ b/lustre/lov/lov_pack.c
@@ -60,7 +60,7 @@ void lov_dump_lmm_v1(int level, struct lov_mds_md_v1 *lmm)
         int i;
 
         CDEBUG(level, "objid "LPX64", magic 0x%08x, pattern %#x\n",
-               le64_to_cpu(lmm->lmm_object_id), le32_to_cpu(lmm->lmm_magic),
+               (__u64)le64_to_cpu(lmm->lmm_object_id), le32_to_cpu(lmm->lmm_magic),
                le32_to_cpu(lmm->lmm_pattern));
         CDEBUG(level,"stripe_size %u, stripe_count %u\n",
                le32_to_cpu(lmm->lmm_stripe_size),
@@ -72,8 +72,8 @@ void lov_dump_lmm_v1(int level, struct lov_mds_md_v1 *lmm)
                          CDEBUG(level,
                                 "stripe %u idx %u subobj "LPX64"/"LPX64"\n",
                                 i, le32_to_cpu(lod->l_ost_idx),
-                                le64_to_cpu(lod->l_object_gr),
-                                le64_to_cpu(lod->l_object_id));
+                                (__u64)le64_to_cpu(lod->l_object_gr),
+                                (__u64)le64_to_cpu(lod->l_object_id));
         } else {
                 CDEBUG(level, "bad stripe_count %u > max_stripe_count %u\n",
                        le32_to_cpu(lmm->lmm_stripe_count),
@@ -85,7 +85,7 @@ void lov_dump_lmm_join(int level, struct lov_mds_md_join *lmmj)
 {
 
         CDEBUG(level, "objid "LPX64", magic 0x%08X, pattern %#X\n",
-               le64_to_cpu(lmmj->lmmj_md.lmm_object_id),
+               (__u64)le64_to_cpu(lmmj->lmmj_md.lmm_object_id),
                le32_to_cpu(lmmj->lmmj_md.lmm_magic),
                le32_to_cpu(lmmj->lmmj_md.lmm_pattern));
         CDEBUG(level,"stripe_size %u, stripe_count %u extent_count %u \n",
@@ -100,8 +100,8 @@ void lov_dump_lmm_v3(int level, struct lov_mds_md_v3 *lmm)
         int i;
 
         CDEBUG(level, "objid "LPX64", magic 0x%08x, pattern %#x\n",
-               le64_to_cpu(lmm->lmm_object_id), le32_to_cpu(lmm->lmm_magic),
-               le32_to_cpu(lmm->lmm_pattern));
+               (__u64)le64_to_cpu(lmm->lmm_object_id),
+               le32_to_cpu(lmm->lmm_magic), le32_to_cpu(lmm->lmm_pattern));
         CDEBUG(level,"stripe_size %u, stripe_count %u\n",
                le32_to_cpu(lmm->lmm_stripe_size),
                le32_to_cpu(lmm->lmm_stripe_count));
@@ -113,8 +113,8 @@ void lov_dump_lmm_v3(int level, struct lov_mds_md_v3 *lmm)
                          CDEBUG(level,
                                 "stripe %u idx %u subobj "LPX64"/"LPX64"\n",
                                 i, le32_to_cpu(lod->l_ost_idx),
-                                le64_to_cpu(lod->l_object_gr),
-                                le64_to_cpu(lod->l_object_id));
+                                (__u64)le64_to_cpu(lod->l_object_gr),
+                                (__u64)le64_to_cpu(lod->l_object_id));
         } else {
                 CDEBUG(level, "bad stripe_count %u > max_stripe_count %u\n",
                        le32_to_cpu(lmm->lmm_stripe_count),

diff --git a/lustre/lvfs/fsfilt.c b/lustre/lvfs/fsfilt.c
index e9d365b..e650f8e 100644 (file)
--- a/lustre/lvfs/fsfilt.c
+++ b/lustre/lvfs/fsfilt.c
@@ -40,7 +40,6 @@
 #define DEBUG_SUBSYSTEM S_FILTER
 
 #include <linux/fs.h>
-#include <linux/jbd.h>
 #include <linux/module.h>
 #include <linux/kmod.h>
 #include <linux/slab.h>

diff --git a/lustre/quota/quota_adjust_qunit.c b/lustre/quota/quota_adjust_qunit.c
index d7b1e17..49d487b 100644 (file)
--- a/lustre/quota/quota_adjust_qunit.c
+++ b/lustre/quota/quota_adjust_qunit.c
@@ -43,7 +43,6 @@
 # include <linux/module.h>
 # include <linux/init.h>
 # include <linux/fs.h>
-# include <linux/jbd.h>
 # include <linux/quota.h>
 #  include <linux/smp_lock.h>
 #  include <linux/buffer_head.h>

diff --git a/lustre/quota/quota_context.c b/lustre/quota/quota_context.c
index 3fddfdc..423629b 100644 (file)
--- a/lustre/quota/quota_context.c
+++ b/lustre/quota/quota_context.c
@@ -331,7 +331,7 @@ check_cur_qunit(struct obd_device *obd,
                 }
         }
         CDEBUG(D_QUOTA, "type: %c, limit: "LPU64", usage: "LPU64
-               ", pending_write: "LPU64", record: "LPD64
+               ", pending_write: "LPU64", record: %llu"
                ", qunit_sz: %lu, tune_sz: %lu, ret: %d.\n",
                QDATA_IS_BLK(qdata) ? 'b' : 'i', limit, usage, pending_write,
                (__s64)record, qunit_sz, tune_sz, ret);

diff --git a/lustre/quota/quota_ctl.c b/lustre/quota/quota_ctl.c
index c164d82..5397b94 100644 (file)
--- a/lustre/quota/quota_ctl.c
+++ b/lustre/quota/quota_ctl.c
@@ -43,7 +43,6 @@
 # include <linux/module.h>
 # include <linux/init.h>
 # include <linux/fs.h>
-# include <linux/jbd.h>
 # include <linux/quota.h>
 #  include <linux/smp_lock.h>
 #  include <linux/buffer_head.h>

diff --git a/lustre/quota/quota_interface.c b/lustre/quota/quota_interface.c
index f62e6fa..461eb5a 100644 (file)
--- a/lustre/quota/quota_interface.c
+++ b/lustre/quota/quota_interface.c
@@ -44,7 +44,6 @@
 # include <linux/module.h>
 # include <linux/init.h>
 # include <linux/fs.h>
-# include <linux/jbd.h>
 #  include <linux/smp_lock.h>
 #  include <linux/buffer_head.h>
 #  include <linux/workqueue.h>

diff --git a/lustre/quota/quota_internal.h b/lustre/quota/quota_internal.h
index 3f19d53..4f17e88 100644 (file)
--- a/lustre/quota/quota_internal.h
+++ b/lustre/quota/quota_internal.h
@@ -87,7 +87,7 @@
 #define LQS_DEBUG(lqs, fmt, arg...)                                           \
         CDEBUG(D_QUOTA, "lqs(%p) id(%u) flag(%lu) type(%c) bunit(%lu) "       \
                "btune(%lu) iunit(%lu) itune(%lu) lqs_bwrite_pending(%lu) "    \
-               "lqs_iwrite_pending(%lu) ino_rec("LPD64") blk_rec("LPD64" )"   \
+               "lqs_iwrite_pending(%lu) ino_rec(%llu) blk_rec(%llu)"   \
                "refcount(%d): "                                               \
                fmt, lqs, lqs->lqs_id, lqs->lqs_flags,                         \
                LQS_IS_GRP(lqs) ? 'g' : 'u',                                   \