Merge branch 'xfs-sparse-fixes' into for-next

5 files changed, 9 insertions, 11 deletions

diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
index d213a2eae95e..23dcb72fc5e6 100644
--- a/fs/xfs/libxfs/xfs_ialloc.c
+++ b/fs/xfs/libxfs/xfs_ialloc.c
@@ -1076,8 +1076,8 @@ xfs_dialloc_ag_finobt_newino(
         int i;
 
         if (agi->agi_newino != cpu_to_be32(NULLAGINO)) {
-                error = xfs_inobt_lookup(cur, agi->agi_newino, XFS_LOOKUP_EQ,
-                                         &i);
+                error = xfs_inobt_lookup(cur, be32_to_cpu(agi->agi_newino),
+                                         XFS_LOOKUP_EQ, &i);
                 if (error)
                         return error;
                 if (i == 1) {
@@ -1085,7 +1085,6 @@ xfs_dialloc_ag_finobt_newino(
                         if (error)
                                 return error;
                         XFS_WANT_CORRUPTED_RETURN(i == 1);
-
                         return 0;
                 }
         }
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 3799695b9249..7a6b406ce6c9 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1349,7 +1349,7 @@ xfs_ioc_setxflags(
 STATIC int
 xfs_getbmap_format(void **ap, struct getbmapx *bmv, int *full)
 {
-        struct getbmap __user   *base = *ap;
+        struct getbmap __user   *base = (struct getbmap __user *)*ap;
 
         /* copy only getbmap portion (not getbmapx) */
         if (copy_to_user(base, bmv, sizeof(struct getbmap)))
@@ -1380,7 +1380,7 @@ xfs_ioc_getbmap(
                 bmx.bmv_iflags |= BMV_IF_NO_DMAPI_READ;
 
         error = xfs_getbmap(ip, &bmx, xfs_getbmap_format,
-                            (struct getbmap *)arg+1);
+                            (__force struct getbmap *)arg+1);
         if (error)
                 return error;
 
@@ -1393,7 +1393,7 @@ xfs_ioc_getbmap(
 STATIC int
 xfs_getbmapx_format(void **ap, struct getbmapx *bmv, int *full)
 {
-        struct getbmapx __user  *base = *ap;
+        struct getbmapx __user  *base = (struct getbmapx __user *)*ap;
 
         if (copy_to_user(base, bmv, sizeof(struct getbmapx)))
                 return -EFAULT;
@@ -1420,7 +1420,7 @@ xfs_ioc_getbmapx(
                 return -EINVAL;
 
         error = xfs_getbmap(ip, &bmx, xfs_getbmapx_format,
-                            (struct getbmapx *)arg+1);
+                            (__force struct getbmapx *)arg+1);
         if (error)
                 return error;
 
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index fbf0384a466f..d36bdbc9eeb2 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -61,8 +61,6 @@ static DEFINE_MUTEX(xfs_uuid_table_mutex);
 static int xfs_uuid_table_size;
 static uuid_t *xfs_uuid_table;
 
-extern struct kset *xfs_kset;
-
 /*
  * See if the UUID is unique among mounted XFS filesystems.
  * Mount fails if UUID is nil or a FS with the same UUID is already mounted.
@@ -729,7 +727,6 @@ xfs_mountfs(
 
         xfs_set_maxicount(mp);
 
-        mp->m_kobj.kobject.kset = xfs_kset;
         error = xfs_sysfs_init(&mp->m_kobj, &xfs_mp_ktype, NULL, mp->m_fsname);
         if (error)
                 goto out;
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 10232102b4a6..d68f23021af3 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -434,6 +434,7 @@ xfs_qm_dquot_isolate(
         struct list_head        *item,
         spinlock_t              *lru_lock,
         void                    *arg)
+                __releases(lru_lock) __acquires(lru_lock)
 {
         struct xfs_dquot        *dqp = container_of(item,
                                                 struct xfs_dquot, q_lru);
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index dcd4b93dccdc..9f622feda6a4 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -63,7 +63,7 @@ static const struct super_operations xfs_super_operations;
 static kmem_zone_t *xfs_ioend_zone;
 mempool_t *xfs_ioend_pool;
 
-struct kset *xfs_kset;                  /* top-level xfs sysfs dir */
+static struct kset *xfs_kset;           /* top-level xfs sysfs dir */
 #ifdef DEBUG
 static struct xfs_kobj xfs_dbg_kobj;    /* global debug sysfs attrs */
 #endif
@@ -1411,6 +1411,7 @@ xfs_fs_fill_super(
         atomic_set(&mp->m_active_trans, 0);
         INIT_DELAYED_WORK(&mp->m_reclaim_work, xfs_reclaim_worker);
         INIT_DELAYED_WORK(&mp->m_eofblocks_work, xfs_eofblocks_worker);
+        mp->m_kobj.kobject.kset = xfs_kset;
 
         mp->m_super = sb;
         sb->s_fs_info = mp;