xfs: clean up minor sparse warnings

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Myers <bpm@sgi.com>

diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c
index 9245e029b8eaddb08f58bbdbe3f78d972cfd2610..d3b63aefd01dbf46f7ec473bd2b01570096a7d0e 100644 (file)
--- a/fs/xfs/xfs_dir2_block.c
+++ b/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/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index f9ccb7b7c043bc0d9524fae8f3afa59975bf32ce..a849a5473aff41ec61dcb0770cc3251fab318206 100644 (file)
--- a/fs/xfs/xfs_ioctl32.c
+++ b/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/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 7c01cda1672754c0ecf185daaa9ac0464552f770..3011b879f850c2a91b94aafa011bf4006d9ab41e 100644 (file)
--- a/fs/xfs/xfs_iops.c
+++ b/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,