From c4b74bf9e14a113e531d2d38a294a870ef3e0593 Mon Sep 17 00:00:00 2001
From: girish <girish>
Date: Thu, 4 Sep 2008 15:15:38 +0000
Subject: [PATCH] ia64 warning fixes. b=15981 i=adilger i=rread i=nathan.rutman

---
 lustre/fid/lproc_fid.c   | 5 +++--
 lustre/llite/dir.c       | 4 ++--
 lustre/llite/rw.c        | 2 +-
 lustre/llite/statahead.c | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lustre/fid/lproc_fid.c b/lustre/fid/lproc_fid.c
index 963e358..63fbacd 100644
--- a/lustre/fid/lproc_fid.c
+++ b/lustre/fid/lproc_fid.c
@@ -77,7 +77,8 @@ seq_proc_write_common(struct file *file, const char *buffer,
 
 	LASSERT(range != NULL);
 
-        rc = sscanf(buffer, "[%Lx - %Lx]\n", &tmp.lr_start, &tmp.lr_end);
+        rc = sscanf(buffer, "[%Lx - %Lx]\n",(long long unsigned *)&tmp.lr_start,
+                    (long long unsigned *)&tmp.lr_end);
 	if (rc != 2 || !range_is_sane(&tmp) || range_is_zero(&tmp))
 		RETURN(-EINVAL);
 	*range = tmp;
@@ -93,7 +94,7 @@ seq_proc_read_common(char *page, char **start, off_t off,
 	ENTRY;
 
         *eof = 1;
-        rc = snprintf(page, count, "[%Lx - %Lx]\n",
+        rc = snprintf(page, count, "["LPX64" - "LPX64"]\n",
                       PRANGE(range));
 	RETURN(rc);
 }
diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index d76a31c..708b01a 100644
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -203,7 +203,7 @@ static void ll_release_page(struct page *page, __u64 hash,
         } else {
                 unlock_page(page);
                 CWARN("NULL mapping page %p, truncated by others: "
-                      "hash(%#llx) | start(%#llx) | end(%#llx)\n",
+                      "hash("LPX64") | start("LPX64") | end("LPX64")\n",
                       page, hash, start, end);
         }
         page_cache_release(page);
@@ -336,7 +336,7 @@ struct page *ll_get_dir_page(struct inode *dir, __u64 hash, int exact,
                          * entries with smaller hash values. Stale page should
                          * be invalidated, and new one fetched.
                          */
-                        CWARN("Stale readpage page %p: %#llx != %#llx\n",
+                        CWARN("Stale readpage page %p: "LPX64" != "LPX64"\n",
                               page, hash, start);
                         ll_release_page(page, hash, start, end);
                 } else {
diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index d5b0f43..3d62c58 100644
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -2246,7 +2246,7 @@ static int ll_file_oig_pages(struct inode * inode, struct page **pages,
 
                 LL_CDEBUG_PAGE(D_PAGE, pages[i], "offset "LPU64","
                                " from %u, bytes = %u\n",
-                               pos, from, bytes);
+                               (__u64)pos, from, bytes);
                 LASSERTF(pos >> CFS_PAGE_SHIFT == pages[i]->index,
                          "wrong page index %lu (%lu)\n",
                          pages[i]->index,
diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c
index fc6e1ae..2e7d099 100644
--- a/lustre/llite/statahead.c
+++ b/lustre/llite/statahead.c
@@ -773,7 +773,7 @@ static int ll_statahead_thread(void *arg)
 
                 if (IS_ERR(page)) {
                         rc = PTR_ERR(page);
-                        CERROR("error reading dir "DFID" at %llu/%u: rc %d\n",
+                        CERROR("error reading dir "DFID" at "LPU64"/%u: rc %d\n",
                                PFID(ll_inode2fid(dir)), pos,
                                sai->sai_index, rc);
                         break;
@@ -972,7 +972,7 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry)
 
                 if (IS_ERR(page)) {
                         rc = PTR_ERR(page);
-                        CERROR("error reading dir "DFID" at %llu: rc %d\n",
+                        CERROR("error reading dir "DFID" at "LPU64": rc %d\n",
                                PFID(ll_inode2fid(dir)), pos, rc);
                         break;
                 }
-- 
1.8.3.1