Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: optimize the negative xattr caching
  xfs: prevent against ioend livelocks in xfs_file_fsync
  xfs: flag all buffers as metadata
  xfs: encapsulate a block of debug code

4 files changed, 33 insertions, 13 deletions

diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index b2b411985591..d1fe74506c4c 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -1224,6 +1224,9 @@ _xfs_buf_ioapply(
                 rw = READ;
         }
 
+        /* we only use the buffer cache for meta-data */
+        rw |= REQ_META;
+
 next_chunk:
         atomic_inc(&bp->b_io_remaining);
         nr_pages = BIO_MAX_SECTORS >> (PAGE_SHIFT - BBSHIFT);
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index 825390e1c138..7f7b42469ea7 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -149,7 +149,9 @@ xfs_file_fsync(
 
         xfs_iflags_clear(ip, XFS_ITRUNCATED);
 
+        xfs_ilock(ip, XFS_IOLOCK_SHARED);
         xfs_ioend_wait(ip);
+        xfs_iunlock(ip, XFS_IOLOCK_SHARED);
 
         if (mp->m_flags & XFS_MOUNT_BARRIER) {
                 /*
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 6544c3236bc8..b9c172b3fbbe 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -1194,9 +1194,14 @@ xfs_setup_inode(
                 break;
         }
 
-        /* if there is no attribute fork no ACL can exist on this inode */
-        if (!XFS_IFORK_Q(ip))
+        /*
+         * If there is no attribute fork no ACL can exist on this inode,
+         * and it can't have any file capabilities attached to it either.
+         */
+        if (!XFS_IFORK_Q(ip)) {
+                inode_has_no_xattr(inode);
                 cache_no_acl(inode);
+        }
 
         xfs_iflags_clear(ip, XFS_INEW);
         barrier();
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index 2925726529f8..5bfcb8779f9f 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -692,6 +692,24 @@ xfs_da_join(xfs_da_state_t *state)
         return(error);
 }
 
+#ifdef  DEBUG
+static void
+xfs_da_blkinfo_onlychild_validate(struct xfs_da_blkinfo *blkinfo, __u16 level)
+{
+        __be16  magic = blkinfo->magic;
+
+        if (level == 1) {
+                ASSERT(magic == cpu_to_be16(XFS_DIR2_LEAFN_MAGIC) ||
+                       magic == cpu_to_be16(XFS_ATTR_LEAF_MAGIC));
+        } else
+                ASSERT(magic == cpu_to_be16(XFS_DA_NODE_MAGIC));
+        ASSERT(!blkinfo->forw);
+        ASSERT(!blkinfo->back);
+}
+#else   /* !DEBUG */
+#define xfs_da_blkinfo_onlychild_validate(blkinfo, level)
+#endif  /* !DEBUG */
+
 /*
  * We have only one entry in the root.  Copy the only remaining child of
  * the old root to block 0 as the new root node.
@@ -700,8 +718,6 @@ STATIC int
 xfs_da_root_join(xfs_da_state_t *state, xfs_da_state_blk_t *root_blk)
 {
         xfs_da_intnode_t *oldroot;
-        /* REFERENCED */
-        xfs_da_blkinfo_t *blkinfo;
         xfs_da_args_t *args;
         xfs_dablk_t child;
         xfs_dabuf_t *bp;
@@ -732,15 +748,9 @@ xfs_da_root_join(xfs_da_state_t *state, xfs_da_state_blk_t *root_blk)
         if (error)
                 return(error);
         ASSERT(bp != NULL);
-        blkinfo = bp->data;
-        if (be16_to_cpu(oldroot->hdr.level) == 1) {
-                ASSERT(blkinfo->magic == cpu_to_be16(XFS_DIR2_LEAFN_MAGIC) ||
-                       blkinfo->magic == cpu_to_be16(XFS_ATTR_LEAF_MAGIC));
-        } else {
-                ASSERT(blkinfo->magic == cpu_to_be16(XFS_DA_NODE_MAGIC));
-        }
-        ASSERT(!blkinfo->forw);
-        ASSERT(!blkinfo->back);
+        xfs_da_blkinfo_onlychild_validate(bp->data,
+                                        be16_to_cpu(oldroot->hdr.level));
+
         memcpy(root_blk->bp->data, bp->data, state->blocksize);
         xfs_da_log_buf(args->trans, root_blk->bp, 0, state->blocksize - 1);
         error = xfs_da_shrink_inode(args, child, bp);