aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_quotaops.c10
-rw-r--r--fs/xfs/xfs_super.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index de9493253edf..a65108594a07 100644
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -125,7 +125,7 @@ xfs_fs_set_info(
125 struct xfs_mount *mp = XFS_M(sb); 125 struct xfs_mount *mp = XFS_M(sb);
126 struct qc_dqblk newlim; 126 struct qc_dqblk newlim;
127 127
128 if (sb->s_flags & MS_RDONLY) 128 if (sb_rdonly(sb))
129 return -EROFS; 129 return -EROFS;
130 if (!XFS_IS_QUOTA_RUNNING(mp)) 130 if (!XFS_IS_QUOTA_RUNNING(mp))
131 return -ENOSYS; 131 return -ENOSYS;
@@ -175,7 +175,7 @@ xfs_quota_enable(
175{ 175{
176 struct xfs_mount *mp = XFS_M(sb); 176 struct xfs_mount *mp = XFS_M(sb);
177 177
178 if (sb->s_flags & MS_RDONLY) 178 if (sb_rdonly(sb))
179 return -EROFS; 179 return -EROFS;
180 if (!XFS_IS_QUOTA_RUNNING(mp)) 180 if (!XFS_IS_QUOTA_RUNNING(mp))
181 return -ENOSYS; 181 return -ENOSYS;
@@ -190,7 +190,7 @@ xfs_quota_disable(
190{ 190{
191 struct xfs_mount *mp = XFS_M(sb); 191 struct xfs_mount *mp = XFS_M(sb);
192 192
193 if (sb->s_flags & MS_RDONLY) 193 if (sb_rdonly(sb))
194 return -EROFS; 194 return -EROFS;
195 if (!XFS_IS_QUOTA_RUNNING(mp)) 195 if (!XFS_IS_QUOTA_RUNNING(mp))
196 return -ENOSYS; 196 return -ENOSYS;
@@ -208,7 +208,7 @@ xfs_fs_rm_xquota(
208 struct xfs_mount *mp = XFS_M(sb); 208 struct xfs_mount *mp = XFS_M(sb);
209 unsigned int flags = 0; 209 unsigned int flags = 0;
210 210
211 if (sb->s_flags & MS_RDONLY) 211 if (sb_rdonly(sb))
212 return -EROFS; 212 return -EROFS;
213 213
214 if (XFS_IS_QUOTA_ON(mp)) 214 if (XFS_IS_QUOTA_ON(mp))
@@ -279,7 +279,7 @@ xfs_fs_set_dqblk(
279{ 279{
280 struct xfs_mount *mp = XFS_M(sb); 280 struct xfs_mount *mp = XFS_M(sb);
281 281
282 if (sb->s_flags & MS_RDONLY) 282 if (sb_rdonly(sb))
283 return -EROFS; 283 return -EROFS;
284 if (!XFS_IS_QUOTA_RUNNING(mp)) 284 if (!XFS_IS_QUOTA_RUNNING(mp))
285 return -ENOSYS; 285 return -ENOSYS;
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 3008f31753df..c996f4ae4a5f 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -210,7 +210,7 @@ xfs_parseargs(
210 /* 210 /*
211 * Copy binary VFS mount flags we are interested in. 211 * Copy binary VFS mount flags we are interested in.
212 */ 212 */
213 if (sb->s_flags & MS_RDONLY) 213 if (sb_rdonly(sb))
214 mp->m_flags |= XFS_MOUNT_RDONLY; 214 mp->m_flags |= XFS_MOUNT_RDONLY;
215 if (sb->s_flags & MS_DIRSYNC) 215 if (sb->s_flags & MS_DIRSYNC)
216 mp->m_flags |= XFS_MOUNT_DIRSYNC; 216 mp->m_flags |= XFS_MOUNT_DIRSYNC;