Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / fs / xfs / xfs_iomap.c

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 5ecf3e3e86aaa4feab769541b0a7a5c1802a73cd..788917f355c4a71ebc4c9b68c5d28aec72614e51 100644 (file)
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -40,7 +40,6 @@
 #include "xfs_ialloc.h"
 #include "xfs_btree.h"
 #include "xfs_bmap.h"
-#include "xfs_bit.h"
 #include "xfs_rtalloc.h"
 #include "xfs_error.h"
 #include "xfs_itable.h"
@@ -551,8 +550,10 @@ xfs_iomap_write_direct(
                         "extent-state : %x \n",
                         (ip->i_mount)->m_fsname,
                         (long long)ip->i_ino,
-                        ret_imap->br_startblock, ret_imap->br_startoff,
-                        ret_imap->br_blockcount,ret_imap->br_state);
+                        (unsigned long long)ret_imap->br_startblock,
+                       (unsigned long long)ret_imap->br_startoff,
+                        (unsigned long long)ret_imap->br_blockcount,
+                       ret_imap->br_state);
         }
        return 0;
 
@@ -608,6 +609,7 @@ xfs_iomap_eof_want_preallocate(
        count_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)XFS_MAXIOFFSET(mp));
        while (count_fsb > 0) {
                imaps = nimaps;
+               firstblock = NULLFSBLOCK;
                error = XFS_BMAPI(mp, NULL, io, start_fsb, count_fsb,
                                  0, &firstblock, 0, imap, &imaps, NULL);
                if (error)
@@ -721,8 +723,10 @@ retry:
                         "extent-state : %x \n",
                         (ip->i_mount)->m_fsname,
                         (long long)ip->i_ino,
-                        ret_imap->br_startblock, ret_imap->br_startoff,
-                        ret_imap->br_blockcount,ret_imap->br_state);
+                        (unsigned long long)ret_imap->br_startblock,
+                       (unsigned long long)ret_imap->br_startoff,
+                        (unsigned long long)ret_imap->br_blockcount,
+                       ret_imap->br_state);
        }
 
        *ret_imap = imap[0];
@@ -853,17 +857,21 @@ xfs_iomap_write_allocate(
                 */
 
                for (i = 0; i < nimaps; i++) {
-                       if ( !(io->io_flags & XFS_IOCORE_RT)  && 
-                               !imap[i].br_startblock) {
+                       if (!(io->io_flags & XFS_IOCORE_RT)  &&
+                           !imap[i].br_startblock) {
                                cmn_err(CE_PANIC,"Access to block zero:  "
                                        "fs <%s> inode: %lld "
-                                       "start_block : %llx start_off : %llx " 
+                                       "start_block : %llx start_off : %llx "
                                        "blkcnt : %llx extent-state : %x \n",
                                        (ip->i_mount)->m_fsname,
                                        (long long)ip->i_ino,
-                                       imap[i].br_startblock,
-                                       imap[i].br_startoff,
-                                       imap[i].br_blockcount,imap[i].br_state);
+                                       (unsigned long long)
+                                               imap[i].br_startblock,
+                                       (unsigned long long)
+                                               imap[i].br_startoff,
+                                       (unsigned long long)
+                                               imap[i].br_blockcount,
+                                       imap[i].br_state);
                         }
                        if ((offset_fsb >= imap[i].br_startoff) &&
                            (offset_fsb < (imap[i].br_startoff +
@@ -969,8 +977,10 @@ xfs_iomap_write_unwritten(
                                "%llx blkcnt : %llx extent-state : %x \n",
                                (ip->i_mount)->m_fsname,
                                (long long)ip->i_ino,
-                               imap.br_startblock,imap.br_startoff,
-                               imap.br_blockcount,imap.br_state);
+                               (unsigned long long)imap.br_startblock,
+                               (unsigned long long)imap.br_startoff,
+                               (unsigned long long)imap.br_blockcount,
+                               imap.br_state);
                }
 
                if ((numblks_fsb = imap.br_blockcount) == 0) {