Merge git://oss.sgi.com:8090/xfs/xfs-2.6

* git://oss.sgi.com:8090/xfs/xfs-2.6: (49 commits)
  [XFS] Remove v1 dir trace macro - missed in a past commit.
  [XFS] 955947: Infinite loop in xfs_bulkstat() on formatter() error
  [XFS] pv 956241, author: nathans, rv: vapo - make ino validation checks
  [XFS] pv 956240, author: nathans, rv: vapo - Minor fixes in
  [XFS] Really fix use after free in xfs_iunpin.
  [XFS] Collapse sv_init and init_sv into just the one interface.
  [XFS] standardize on one sema init macro
  [XFS] Reduce endian flipping in alloc_btree, same as was done for
  [XFS] Minor cleanup from dio locking fix, remove an extra conditional.
  [XFS] Fix kmem_zalloc_greedy warnings on 64 bit platforms.
  [XFS] pv 955157, rv bnaujok - break the loop on EFAULT formatter() error
  [XFS] pv 955157, rv bnaujok - break the loop on formatter() error
  [XFS] Fixes the leak in reservation space because we weren't ungranting
  [XFS] Add lock annotations to xfs_trans_update_ail and
  [XFS] Fix a porting botch on the realtime subvol growfs code path.
  [XFS] Minor code rearranging and cleanup to prevent some coverity false
  [XFS] Remove a no-longer-correct debug assert from dio completion
  [XFS] Add a greedy allocation interface, allocating within a min/max size
  [XFS] Improve error handling for the zero-fsblock extent detection code.
  [XFS] Be more defensive with page flags (error/private) for metadata
  ...

1 files changed, 6 insertions, 5 deletions

diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index 33164a85aa9d..a446e5a115c6 100644
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
@@ -458,7 +458,7 @@ nextag:
                  */
                 if (XFS_FORCED_SHUTDOWN(mp)) {
                         up_read(&mp->m_peraglock);
-                        return (xfs_buf_t *)0;
+                        return NULL;
                 }
                 agno++;
                 if (agno >= agcount)
@@ -466,7 +466,7 @@ nextag:
                 if (agno == pagno) {
                         if (flags == 0) {
                                 up_read(&mp->m_peraglock);
-                                return (xfs_buf_t *)0;
+                                return NULL;
                         }
                         flags = 0;
                 }
@@ -529,10 +529,10 @@ xfs_dialloc(
         int             offset;         /* index of inode in chunk */
         xfs_agino_t     pagino;         /* parent's a.g. relative inode # */
         xfs_agnumber_t  pagno;          /* parent's allocation group number */
-        xfs_inobt_rec_t rec;            /* inode allocation record */
+        xfs_inobt_rec_incore_t rec;     /* inode allocation record */
         xfs_agnumber_t  tagno;          /* testing allocation group number */
         xfs_btree_cur_t *tcur;          /* temp cursor */
-        xfs_inobt_rec_t trec;           /* temp inode allocation record */
+        xfs_inobt_rec_incore_t trec;    /* temp inode allocation record */
 
 
         if (*IO_agbp == NULL) {
@@ -945,7 +945,7 @@ xfs_difree(
         int             ilen;   /* inodes in an inode cluster */
         xfs_mount_t     *mp;    /* mount structure for filesystem */
         int             off;    /* offset of inode in inode chunk */
-        xfs_inobt_rec_t rec;    /* btree record */
+        xfs_inobt_rec_incore_t rec;     /* btree record */
 
         mp = tp->t_mountp;
 
@@ -1195,6 +1195,7 @@ xfs_dilocate(
                                         "(0x%llx)",
                                         ino, XFS_AGINO_TO_INO(mp, agno, agino));
                 }
+                xfs_stack_trace();
 #endif /* DEBUG */
                 return XFS_ERROR(EINVAL);
         }