vserver 1.9.3

[linux-2.6.git] / fs / xfs / xfs_da_btree.c

diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index 3965561..bbe00dc 100644 (file)
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -2092,7 +2092,7 @@ xfs_da_do_buf(
        int             caller,
        inst_t          *ra)
 {
-       xfs_buf_t       *bp = 0;
+       xfs_buf_t       *bp = NULL;
        xfs_buf_t       **bplist;
        int             error=0;
        int             i;
@@ -2166,9 +2166,9 @@ xfs_da_do_buf(
                                        cmn_err(CE_ALERT,
                                                "[%02d] br_startoff %lld br_startblock %lld br_blockcount %lld br_state %d\n",
                                                i,
-                                               mapp[i].br_startoff,
-                                               mapp[i].br_startblock,
-                                               mapp[i].br_blockcount,
+                                               (long long)mapp[i].br_startoff,
+                                               (long long)mapp[i].br_startblock,
+                                               (long long)mapp[i].br_blockcount,
                                                mapp[i].br_state);
                                }
                        }