Merge tag 'linux-kselftest-kunit-5.15-rc1' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / fs / xfs / xfs_ioctl.c

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 16039ea..0c795dc 100644 (file)
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -756,7 +756,7 @@ xfs_ioc_fsbulkstat(
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       if (XFS_FORCED_SHUTDOWN(mp))
+       if (xfs_is_shutdown(mp))
                return -EIO;
 
        if (copy_from_user(&bulkreq, arg, sizeof(struct xfs_fsop_bulkreq)))
@@ -927,7 +927,7 @@ xfs_ioc_bulkstat(
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       if (XFS_FORCED_SHUTDOWN(mp))
+       if (xfs_is_shutdown(mp))
                return -EIO;
 
        if (copy_from_user(&hdr, &arg->hdr, sizeof(hdr)))
@@ -977,7 +977,7 @@ xfs_ioc_inumbers(
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       if (XFS_FORCED_SHUTDOWN(mp))
+       if (xfs_is_shutdown(mp))
                return -EIO;
 
        if (copy_from_user(&hdr, &arg->hdr, sizeof(hdr)))
@@ -1010,7 +1010,7 @@ xfs_ioc_fsgeometry(
        struct xfs_fsop_geom    fsgeo;
        size_t                  len;
 
-       xfs_fs_geometry(&mp->m_sb, &fsgeo, struct_version);
+       xfs_fs_geometry(mp, &fsgeo, struct_version);
 
        if (struct_version <= 3)
                len = sizeof(struct xfs_fsop_geom_v1);
@@ -1213,7 +1213,7 @@ xfs_ioctl_setattr_xflags(
 
        /* diflags2 only valid for v3 inodes. */
        i_flags2 = xfs_flags2diflags2(ip, fa->fsx_xflags);
-       if (i_flags2 && !xfs_sb_version_has_v3inode(&mp->m_sb))
+       if (i_flags2 && !xfs_has_v3inodes(mp))
                return -EINVAL;
 
        ip->i_diflags = xfs_flags2diflags(ip, fa->fsx_xflags);
@@ -1237,8 +1237,7 @@ xfs_ioctl_setattr_prepare_dax(
        if (S_ISDIR(inode->i_mode))
                return;
 
-       if ((mp->m_flags & XFS_MOUNT_DAX_ALWAYS) ||
-           (mp->m_flags & XFS_MOUNT_DAX_NEVER))
+       if (xfs_has_dax_always(mp) || xfs_has_dax_never(mp))
                return;
 
        if (((fa->fsx_xflags & FS_XFLAG_DAX) &&
@@ -1263,10 +1262,10 @@ xfs_ioctl_setattr_get_trans(
        struct xfs_trans        *tp;
        int                     error = -EROFS;
 
-       if (mp->m_flags & XFS_MOUNT_RDONLY)
+       if (xfs_is_readonly(mp))
                goto out_error;
        error = -EIO;
-       if (XFS_FORCED_SHUTDOWN(mp))
+       if (xfs_is_shutdown(mp))
                goto out_error;
 
        error = xfs_trans_alloc_ichange(ip, NULL, NULL, pdqp,
@@ -1274,7 +1273,7 @@ xfs_ioctl_setattr_get_trans(
        if (error)
                goto out_error;
 
-       if (mp->m_flags & XFS_MOUNT_WSYNC)
+       if (xfs_has_wsync(mp))
                xfs_trans_set_sync(tp);
 
        return tp;
@@ -1362,9 +1361,9 @@ xfs_ioctl_setattr_check_projid(
        if (!fa->fsx_valid)
                return 0;
 
-       /* Disallow 32bit project ids if projid32bit feature is not enabled. */
+       /* Disallow 32bit project ids if 32bit IDs are not enabled. */
        if (fa->fsx_projid > (uint16_t)-1 &&
-           !xfs_sb_version_hasprojid32bit(&ip->i_mount->m_sb))
+           !xfs_has_projid32(ip->i_mount))
                return -EINVAL;
        return 0;
 }
@@ -1450,7 +1449,7 @@ xfs_fileattr_set(
 
        /* Change the ownerships and register project quota modifications */
        if (ip->i_projid != fa->fsx_projid) {
-               if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp)) {
+               if (XFS_IS_PQUOTA_ON(mp)) {
                        olddquot = xfs_qm_vop_chown(tp, ip,
                                                &ip->i_pdquot, pdqp);
                }
@@ -1467,7 +1466,7 @@ xfs_fileattr_set(
        else
                ip->i_extsize = 0;
 
-       if (xfs_sb_version_has_v3inode(&mp->m_sb)) {
+       if (xfs_has_v3inodes(mp)) {
                if (ip->i_diflags2 & XFS_DIFLAG2_COWEXTSIZE)
                        ip->i_cowextsize = XFS_B_TO_FSB(mp, fa->fsx_cowextsize);
                else
@@ -1792,7 +1791,7 @@ xfs_ioc_swapext(
                goto out_put_tmp_file;
        }
 
-       if (XFS_FORCED_SHUTDOWN(ip->i_mount)) {
+       if (xfs_is_shutdown(ip->i_mount)) {
                error = -EIO;
                goto out_put_tmp_file;
        }
@@ -2081,7 +2080,7 @@ xfs_file_ioctl(
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
 
-               if (mp->m_flags & XFS_MOUNT_RDONLY)
+               if (xfs_is_readonly(mp))
                        return -EROFS;
 
                if (copy_from_user(&inout, arg, sizeof(inout)))
@@ -2198,7 +2197,7 @@ xfs_file_ioctl(
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
 
-               if (mp->m_flags & XFS_MOUNT_RDONLY)
+               if (xfs_is_readonly(mp))
                        return -EROFS;
 
                if (copy_from_user(&eofb, arg, sizeof(eofb)))