Branch b1_8

b=19869

i=shadow, johann, tianzy

Fixes for Werror flag enabled.

diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index 3b04691..79bc040 100644 (file)
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -396,7 +396,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 9abf981..0b75be6 100644 (file)
--- a/lustre/lov/lov_pack.c
+++ b/lustre/lov/lov_pack.c
@@ -59,7 +59,7 @@ static void lov_dump_lmm_common(int level, void *lmmp)
         struct lov_mds_md *lmm = lmmp;
 
         CDEBUG(level, "objid "LPX64", magic 0x%08x, pattern %#x\n",
-               le64_to_cpu(lmm->lmm_object_id),
+               (__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",
@@ -80,8 +80,8 @@ static void lov_dump_lmm_objects(int level, struct lov_ost_data *lod,
         for (i = 0; i < stripe_count; ++i, ++lod) {
                 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));
         }
 }
 

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',                                   \