From 3ab9b45f05a75dd781ec773fed723757ba1dc575 Mon Sep 17 00:00:00 2001
From: Dave Chinner <dchinner@redhat.com>
Date: Wed, 7 Mar 2012 04:50:19 +0000
Subject: [PATCH] --- yaml --- r: 294634 b: refs/heads/master c:
 8d2a5e6ee37f205b3d76c223d4f3f88ba1d06220 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/fs/xfs/xfs_dir2_block.c |  1 +
 trunk/fs/xfs/xfs_ioctl32.c    |  2 +-
 trunk/fs/xfs/xfs_iops.c       | 13 ++++++++-----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 401c3e44ce64..48f1dfc3e424 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a05931ceb0160deadbd7798d60d01b17f2d81b09
+refs/heads/master: 8d2a5e6ee37f205b3d76c223d4f3f88ba1d06220
diff --git a/trunk/fs/xfs/xfs_dir2_block.c b/trunk/fs/xfs/xfs_dir2_block.c
index 9245e029b8ea..d3b63aefd01d 100644
--- a/trunk/fs/xfs/xfs_dir2_block.c
+++ b/trunk/fs/xfs/xfs_dir2_block.c
@@ -29,6 +29,7 @@
 #include "xfs_dinode.h"
 #include "xfs_inode.h"
 #include "xfs_inode_item.h"
+#include "xfs_dir2.h"
 #include "xfs_dir2_format.h"
 #include "xfs_dir2_priv.h"
 #include "xfs_error.h"
diff --git a/trunk/fs/xfs/xfs_ioctl32.c b/trunk/fs/xfs/xfs_ioctl32.c
index f9ccb7b7c043..a849a5473aff 100644
--- a/trunk/fs/xfs/xfs_ioctl32.c
+++ b/trunk/fs/xfs/xfs_ioctl32.c
@@ -293,7 +293,7 @@ xfs_compat_ioc_bulkstat(
 		int res;
 
 		error = xfs_bulkstat_one_compat(mp, inlast, bulkreq.ubuffer,
-				sizeof(compat_xfs_bstat_t), 0, &res);
+				sizeof(compat_xfs_bstat_t), NULL, &res);
 	} else if (cmd == XFS_IOC_FSBULKSTAT_32) {
 		error = xfs_bulkstat(mp, &inlast, &count,
 			xfs_bulkstat_one_compat, sizeof(compat_xfs_bstat_t),
diff --git a/trunk/fs/xfs/xfs_iops.c b/trunk/fs/xfs/xfs_iops.c
index 7c01cda16727..3011b879f850 100644
--- a/trunk/fs/xfs/xfs_iops.c
+++ b/trunk/fs/xfs/xfs_iops.c
@@ -50,12 +50,15 @@
 #include <linux/fiemap.h>
 #include <linux/slab.h>
 
-int xfs_initxattrs(struct inode *inode, const struct xattr *xattr_array,
-		   void *fs_info)
+static int
+xfs_initxattrs(
+	struct inode		*inode,
+	const struct xattr	*xattr_array,
+	void			*fs_info)
 {
-	const struct xattr *xattr;
-	struct xfs_inode *ip = XFS_I(inode);
-	int error = 0;
+	const struct xattr	*xattr;
+	struct xfs_inode	*ip = XFS_I(inode);
+	int			error = 0;
 
 	for (xattr = xattr_array; xattr->name != NULL; xattr++) {
 		error = xfs_attr_set(ip, xattr->name, xattr->value,