--- lustre/llite/lloop-old.c	2009-11-26 10:34:02.393003227 +0000
+++ lustre/llite/lloop.c	2009-11-26 10:35:03.590056455 +0000
@@ -500,7 +500,7 @@ static int loop_set_fd(struct lloop_devi
         lo->lo_queue->unplug_fn = loop_unplug;
 
         /* queue parameters */
-        blk_queue_hardsect_size(lo->lo_queue, CFS_PAGE_SIZE);
+        blk_queue_logical_block_size(lo->lo_queue, CFS_PAGE_SIZE);
         blk_queue_max_sectors(lo->lo_queue,
                               LLOOP_MAX_SEGMENTS << (CFS_PAGE_SHIFT - 9));
         blk_queue_max_phys_segments(lo->lo_queue, LLOOP_MAX_SEGMENTS);
--- lustre/llite/file-old.c	2009-11-26 10:37:51.401943992 +0000
+++ lustre/llite/file.c	2009-11-26 10:58:28.326208286 +0000
@@ -47,6 +47,7 @@
 #include <linux/file.h>
 #include "llite_internal.h"
 #include <lustre/ll_fiemap.h>
+#include <linux/posix_acl.h>
 
 /* also used by llite/special.c:ll_special_open() */
 struct ll_file_data *ll_file_data_get(void)
@@ -1423,7 +1424,7 @@ static ssize_t ll_file_aio_read(struct k
 
         count = ll_file_get_iov_count(iov, &nr_segs);
         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),size="LPSZ",offset=%Ld\n",
-               inode->i_ino, inode->i_generation, inode, count, *ppos);
+               inode->i_ino, inode->i_generation, inode, (unsigned int)count, *ppos);
         /* "If nbyte is 0, read() will return 0 and have no other results."
          *                      -- Single Unix Spec */
         if (count == 0)
@@ -1593,7 +1594,7 @@ repeat:
 
         chunk = end - *ppos + 1;
         CDEBUG(D_INODE,"Read ino %lu, "LPSZ" bytes, offset %lld, i_size %llu\n",
-               inode->i_ino, chunk, *ppos, i_size_read(inode));
+               inode->i_ino, (unsigned int)chunk, *ppos, i_size_read(inode));
 
         /* turn off the kernel's read-ahead */
         if (ltd.lock_style != LL_LOCK_STYLE_NOLOCK) {
@@ -1773,7 +1774,7 @@ static ssize_t ll_file_aio_write(struct 
         count = ll_file_get_iov_count(iov, &nr_segs);
 
         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),size="LPSZ",offset=%Ld\n",
-               inode->i_ino, inode->i_generation, inode, count, *ppos);
+               inode->i_ino, inode->i_generation, inode, (unsigned int)count, *ppos);
 
         SIGNAL_MASK_ASSERT(); /* XXX BUG 1511 */
 
@@ -1876,7 +1877,7 @@ repeat:
         /* generic_file_write handles O_APPEND after getting i_mutex */
         chunk = end - *ppos + 1;
         CDEBUG(D_INFO, "Writing inode %lu, "LPSZ" bytes, offset %Lu\n",
-               inode->i_ino, chunk, *ppos);
+               inode->i_ino, (unsigned int)chunk, *ppos);
         if (tree_locked) {
                 struct ost_lvb *xtimes;
                 /* write under locks
@@ -1911,7 +1911,7 @@ repeat:
                                                 *ppos);
 #endif
         } else {
-                size_t ocount, ncount;
+                size_t ocount = 0, ncount = 0;
 
                 retval = ll_generic_segment_checks(iov_copy, &nrsegs_copy,
                                                    &ocount, VERIFY_READ);
@@ -2111,7 +2112,7 @@ static ssize_t ll_file_splice_read(struc
         ENTRY;
 
         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),size="LPSZ",offset=%Ld\n",
-               inode->i_ino, inode->i_generation, inode, count, *ppos);
+               inode->i_ino, inode->i_generation, inode, (unsigned int)count, *ppos);
 
         /* "If nbyte is 0, read() will return 0 and have no other results."
          *                      -- Single Unix Spec */
@@ -2176,7 +2177,7 @@ static ssize_t ll_file_splice_read(struc
         }
 
         CDEBUG(D_INFO, "Send ino %lu, "LPSZ" bytes, offset %lld, i_size %llu\n",
-               inode->i_ino, count, *ppos, i_size_read(inode));
+               inode->i_ino, (unsigned int)count, *ppos, i_size_read(inode));
 
         ll_ra_read_init(in_file, &bead, *ppos, count);
         /* BUG: 5972 */
--- lustre/llite/rw26-old.c	2009-11-26 11:05:58.837891197 +0000
+++ lustre/llite/rw26.c	2009-11-26 11:07:00.971950937 +0000
@@ -242,8 +242,8 @@ ssize_t ll_direct_IO(int rw, struct file
 
         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p), size="LPSZ" (max %lu), "
                "offset=%lld=%llx, pages "LPSZ" (max %lu)\n",
-               inode->i_ino, inode->i_generation, inode, count, MAX_DIO_SIZE,
-               file_offset, file_offset, count >> CFS_PAGE_SHIFT,
+               inode->i_ino, inode->i_generation, inode, (unsigned int)count, MAX_DIO_SIZE,
+               file_offset, file_offset, (unsigned int)count >> CFS_PAGE_SHIFT,
                MAX_DIO_SIZE >> CFS_PAGE_SHIFT);
 
         if (rw == WRITE)
--- lustre/obdclass/obd_mount-old.c	2009-11-26 11:12:38.267704228 +0000
+++ lustre/obdclass/obd_mount.c	2009-11-26 11:12:57.839038082 +0000
@@ -279,7 +279,7 @@ static int ldd_parse(struct lvfs_run_ctx
         CDEBUG(D_MOUNT, "Have %s, size %lu\n", MOUNT_DATA_FILE, len);
         if (len != sizeof(*ldd)) {
                 CERROR("disk data size does not match: see %lu expect "LPSZ"\n",
-                       len, sizeof(*ldd));
+                       len, (unsigned int)sizeof(*ldd));
                 GOTO(out_close, rc = -EINVAL);
         }
 
--- lustre/include/lustre_net-old.h	2009-11-26 11:19:39.505890397 +0000
+++ lustre/include/lustre_net.h	2009-11-26 11:20:11.067428869 +0000
@@ -102,7 +102,7 @@
  */
 
 #define LDLM_THREADS_AUTO_MIN (2)
-#define LDLM_THREADS_AUTO_MAX min(num_online_cpus()*num_online_cpus()*32, 128)
+#define LDLM_THREADS_AUTO_MAX min_t(unsigned, num_online_cpus()*num_online_cpus()*32, 128)
 #define LDLM_BL_THREADS  LDLM_THREADS_AUTO_MIN
 #define LDLM_NBUFS      (64 * num_online_cpus())
 #define LDLM_BUFSIZE    (8 * 1024)