diff options
author | Christoph Hellwig <hch@infradead.org> | 2011-12-06 16:58:07 -0500 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2011-12-08 13:30:32 -0500 |
commit | 93b8a5854f247138e401471a9c3b82ccb62ff608 (patch) | |
tree | 5a914815ff68b1d36289292bb518a6b47f7fb2d1 /fs/xfs/xfs_super.c | |
parent | 9f9c19ec1a59422c7687b11847ed3408128aa0d6 (diff) |
xfs: remove the deprecated nodelaylog option
The delaylog mode has been the default for a long time, and the nodelaylog
option has been scheduled for removal in Linux 3.3. Remove it and code
only used by it now that we have opened the 3.3 window.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_super.c')
-rw-r--r-- | fs/xfs/xfs_super.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 3eca58f51ae9..0e76348d958a 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c | |||
@@ -199,7 +199,6 @@ xfs_parseargs( | |||
199 | mp->m_flags |= XFS_MOUNT_BARRIER; | 199 | mp->m_flags |= XFS_MOUNT_BARRIER; |
200 | mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE; | 200 | mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE; |
201 | mp->m_flags |= XFS_MOUNT_SMALL_INUMS; | 201 | mp->m_flags |= XFS_MOUNT_SMALL_INUMS; |
202 | mp->m_flags |= XFS_MOUNT_DELAYLOG; | ||
203 | 202 | ||
204 | /* | 203 | /* |
205 | * These can be overridden by the mount option parsing. | 204 | * These can be overridden by the mount option parsing. |
@@ -353,11 +352,11 @@ xfs_parseargs( | |||
353 | mp->m_qflags |= (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE); | 352 | mp->m_qflags |= (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE); |
354 | mp->m_qflags &= ~XFS_OQUOTA_ENFD; | 353 | mp->m_qflags &= ~XFS_OQUOTA_ENFD; |
355 | } else if (!strcmp(this_char, MNTOPT_DELAYLOG)) { | 354 | } else if (!strcmp(this_char, MNTOPT_DELAYLOG)) { |
356 | mp->m_flags |= XFS_MOUNT_DELAYLOG; | 355 | xfs_warn(mp, |
356 | "delaylog is the default now, option is deprecated."); | ||
357 | } else if (!strcmp(this_char, MNTOPT_NODELAYLOG)) { | 357 | } else if (!strcmp(this_char, MNTOPT_NODELAYLOG)) { |
358 | mp->m_flags &= ~XFS_MOUNT_DELAYLOG; | ||
359 | xfs_warn(mp, | 358 | xfs_warn(mp, |
360 | "nodelaylog is deprecated and will be removed in Linux 3.3"); | 359 | "nodelaylog support has been removed, option is deprecated."); |
361 | } else if (!strcmp(this_char, MNTOPT_DISCARD)) { | 360 | } else if (!strcmp(this_char, MNTOPT_DISCARD)) { |
362 | mp->m_flags |= XFS_MOUNT_DISCARD; | 361 | mp->m_flags |= XFS_MOUNT_DISCARD; |
363 | } else if (!strcmp(this_char, MNTOPT_NODISCARD)) { | 362 | } else if (!strcmp(this_char, MNTOPT_NODISCARD)) { |
@@ -395,13 +394,6 @@ xfs_parseargs( | |||
395 | return EINVAL; | 394 | return EINVAL; |
396 | } | 395 | } |
397 | 396 | ||
398 | if ((mp->m_flags & XFS_MOUNT_DISCARD) && | ||
399 | !(mp->m_flags & XFS_MOUNT_DELAYLOG)) { | ||
400 | xfs_warn(mp, | ||
401 | "the discard option is incompatible with the nodelaylog option"); | ||
402 | return EINVAL; | ||
403 | } | ||
404 | |||
405 | #ifndef CONFIG_XFS_QUOTA | 397 | #ifndef CONFIG_XFS_QUOTA |
406 | if (XFS_IS_QUOTA_RUNNING(mp)) { | 398 | if (XFS_IS_QUOTA_RUNNING(mp)) { |
407 | xfs_warn(mp, "quota support not available in this kernel."); | 399 | xfs_warn(mp, "quota support not available in this kernel."); |
@@ -501,7 +493,6 @@ xfs_showargs( | |||
501 | { XFS_MOUNT_ATTR2, "," MNTOPT_ATTR2 }, | 493 | { XFS_MOUNT_ATTR2, "," MNTOPT_ATTR2 }, |
502 | { XFS_MOUNT_FILESTREAMS, "," MNTOPT_FILESTREAM }, | 494 | { XFS_MOUNT_FILESTREAMS, "," MNTOPT_FILESTREAM }, |
503 | { XFS_MOUNT_GRPID, "," MNTOPT_GRPID }, | 495 | { XFS_MOUNT_GRPID, "," MNTOPT_GRPID }, |
504 | { XFS_MOUNT_DELAYLOG, "," MNTOPT_DELAYLOG }, | ||
505 | { XFS_MOUNT_DISCARD, "," MNTOPT_DISCARD }, | 496 | { XFS_MOUNT_DISCARD, "," MNTOPT_DISCARD }, |
506 | { 0, NULL } | 497 | { 0, NULL } |
507 | }; | 498 | }; |