xfs: remove deprecated sysctls

xfsbufd_centisecs and age_buffer_centisecs were due for removal in
3.14. We forgot to do that - it's now well past time to remove these
deprecated, unused sysctls.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt
index 5be51fd888bd9bccc02f47caca8c0a5b61a9ec76..7077103ac541b97113ae94c6970d58763e6187d6 100644 (file)
--- a/Documentation/filesystems/xfs.txt
+++ b/Documentation/filesystems/xfs.txt
@@ -348,16 +348,13 @@ The following sysctls are available for the XFS filesystem:
 Deprecated Sysctls
 ==================
 
-  fs.xfs.xfsbufd_centisecs     (Min: 50  Default: 100  Max: 3000)
-       Dirty metadata is now tracked by the log subsystem and
-       flushing is driven by log space and idling demands. The
-       xfsbufd no longer exists, so this syctl does nothing.
+None at present.
 
-       Due for removal in 3.14.
 
-  fs.xfs.age_buffer_centisecs  (Min: 100  Default: 1500  Max: 720000)
-       Dirty metadata is now tracked by the log subsystem and
-       flushing is driven by log space and idling demands. The
-       xfsbufd no longer exists, so this syctl does nothing.
+Removed Sysctls
+===============
 
-       Due for removal in 3.14.
+  Name                         Removed
+  ----                         -------
+  fs.xfs.xfsbufd_centisec      v3.20
+  fs.xfs.age_buffer_centisecs  v3.20

diff --git a/fs/xfs/xfs_sysctl.c b/fs/xfs/xfs_sysctl.c
index 1743b9f8e23d1582ddbd30372a10d5559cb52b1e..a0c8067cea6f2c0055f7274a7d0dbd65f2d52887 100644 (file)
--- a/fs/xfs/xfs_sysctl.c
+++ b/fs/xfs/xfs_sysctl.c
@@ -148,24 +148,6 @@ static struct ctl_table xfs_table[] = {
                .extra1         = &xfs_params.inherit_noatim.min,
                .extra2         = &xfs_params.inherit_noatim.max
        },
-       {
-               .procname       = "xfsbufd_centisecs",
-               .data           = &xfs_params.xfs_buf_timer.val,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &xfs_params.xfs_buf_timer.min,
-               .extra2         = &xfs_params.xfs_buf_timer.max
-       },
-       {
-               .procname       = "age_buffer_centisecs",
-               .data           = &xfs_params.xfs_buf_age.val,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &xfs_params.xfs_buf_age.min,
-               .extra2         = &xfs_params.xfs_buf_age.max
-       },
        {
                .procname       = "inherit_nosymlinks",
                .data           = &xfs_params.inherit_nosym.val,