[XFS] Update sysctls - use ints, not ulongs, and show pagebuf

values in jiffies like everybody else

SGI Modid: 2.5.x-xfs:slinx:158665a

diff --git a/fs/xfs/linux/xfs_sysctl.c b/fs/xfs/linux/xfs_sysctl.c
index 48d58aec008f841cc6be0ae711cb8cace417c836..076d966c2149a923284eaffe3ecec6c27d50f689 100644 (file)
--- a/fs/xfs/linux/xfs_sysctl.c
+++ b/fs/xfs/linux/xfs_sysctl.c
@@ -68,54 +68,54 @@ xfs_stats_clear_proc_handler(
 
 STATIC ctl_table xfs_table[] = {
        {XFS_RESTRICT_CHOWN, "restrict_chown", &xfs_params.restrict_chown.val,
-       sizeof(ulong), 0644, NULL, &proc_doulongvec_minmax,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
        &sysctl_intvec, NULL, 
        &xfs_params.restrict_chown.min, &xfs_params.restrict_chown.max},
 
        {XFS_SGID_INHERIT, "irix_sgid_inherit", &xfs_params.sgid_inherit.val,
-       sizeof(ulong), 0644, NULL, &proc_doulongvec_minmax,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
        &sysctl_intvec, NULL,
        &xfs_params.sgid_inherit.min, &xfs_params.sgid_inherit.max},
 
        {XFS_SYMLINK_MODE, "irix_symlink_mode", &xfs_params.symlink_mode.val,
-       sizeof(ulong), 0644, NULL, &proc_doulongvec_minmax,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
        &sysctl_intvec, NULL, 
        &xfs_params.symlink_mode.min, &xfs_params.symlink_mode.max},
 
        {XFS_PANIC_MASK, "panic_mask", &xfs_params.panic_mask.val,
-       sizeof(ulong), 0644, NULL, &proc_doulongvec_minmax,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
        &sysctl_intvec, NULL, 
        &xfs_params.panic_mask.min, &xfs_params.panic_mask.max},
 
        {XFS_ERRLEVEL, "error_level", &xfs_params.error_level.val,
-       sizeof(ulong), 0644, NULL, &proc_doulongvec_minmax,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
        &sysctl_intvec, NULL, 
        &xfs_params.error_level.min, &xfs_params.error_level.max},
 
        {XFS_SYNC_INTERVAL, "sync_interval", &xfs_params.sync_interval.val,
-       sizeof(ulong), 0644, NULL, &proc_doulongvec_minmax,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
        &sysctl_intvec, NULL, 
        &xfs_params.sync_interval.min, &xfs_params.sync_interval.max},
 
        {XFS_INHERIT_SYNC, "inherit_sync", &xfs_params.inherit_sync.val,
-       sizeof(ulong), 0644, NULL, &proc_doulongvec_minmax,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
        &sysctl_intvec, NULL,
        &xfs_params.inherit_sync.min, &xfs_params.inherit_sync.max},
 
        {XFS_INHERIT_NODUMP, "inherit_nodump", &xfs_params.inherit_nodump.val,
-       sizeof(ulong), 0644, NULL, &proc_doulongvec_minmax,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
        &sysctl_intvec, NULL,
        &xfs_params.inherit_nodump.min, &xfs_params.inherit_nodump.max},
 
        {XFS_INHERIT_NOATIME, "inherit_noatime", &xfs_params.inherit_noatim.val,
-       sizeof(ulong), 0644, NULL, &proc_doulongvec_minmax,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
        &sysctl_intvec, NULL,
        &xfs_params.inherit_noatim.min, &xfs_params.inherit_noatim.max},
 
        /* please keep this the last entry */
 #ifdef CONFIG_PROC_FS
        {XFS_STATS_CLEAR, "stats_clear", &xfs_params.stats_clear.val,
-       sizeof(ulong), 0644, NULL, &xfs_stats_clear_proc_handler,
+       sizeof(int), 0644, NULL, &xfs_stats_clear_proc_handler,
        &sysctl_intvec, NULL, 
        &xfs_params.stats_clear.min, &xfs_params.stats_clear.max},
 #endif /* CONFIG_PROC_FS */

diff --git a/fs/xfs/linux/xfs_sysctl.h b/fs/xfs/linux/xfs_sysctl.h
index 35faa5ec0019b516c27a6b78809624bbe2daa3a7..c08d419b1856479850ad5a428be4c73a752e17a5 100644 (file)
--- a/fs/xfs/linux/xfs_sysctl.h
+++ b/fs/xfs/linux/xfs_sysctl.h
@@ -40,9 +40,9 @@
  */
 
 typedef struct xfs_sysctl_val {
-       ulong min;
-       ulong val;
-       ulong max;
+       int min;
+       int val;
+       int max;
 } xfs_sysctl_val_t;
 
 typedef struct xfs_param {

diff --git a/fs/xfs/pagebuf/page_buf.c b/fs/xfs/pagebuf/page_buf.c
index c7415e512d5841a660b574655bc0f97b9071df08..0f05f580fa1807f1326790892e7c89d2d9ab9a42 100644 (file)
--- a/fs/xfs/pagebuf/page_buf.c
+++ b/fs/xfs/pagebuf/page_buf.c
@@ -1867,23 +1867,23 @@ STATIC struct ctl_table_header *pagebuf_table_header;
 
 STATIC ctl_table pagebuf_table[] = {
        {PB_FLUSH_INT, "flush_int", &pb_params.flush_interval.val,
-       sizeof(ulong), 0644, NULL, &proc_doulongvec_ms_jiffies_minmax,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
        &sysctl_intvec, NULL,
        &pb_params.flush_interval.min, &pb_params.flush_interval.max},
 
        {PB_FLUSH_AGE, "flush_age", &pb_params.age_buffer.val,
-       sizeof(ulong), 0644, NULL, &proc_doulongvec_ms_jiffies_minmax,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
        &sysctl_intvec, NULL, 
        &pb_params.age_buffer.min, &pb_params.age_buffer.max},
 
        {PB_STATS_CLEAR, "stats_clear", &pb_params.stats_clear.val,
-       sizeof(ulong), 0644, NULL, &pb_stats_clear_handler,
+       sizeof(int), 0644, NULL, &pb_stats_clear_handler,
        &sysctl_intvec, NULL, 
        &pb_params.stats_clear.min, &pb_params.stats_clear.max},
 
 #ifdef PAGEBUF_TRACE
        {PB_DEBUG, "debug", &pb_params.debug.val,
-       sizeof(ulong), 0644, NULL, &proc_doulongvec_minmax,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
        &sysctl_intvec, NULL, 
        &pb_params.debug.min, &pb_params.debug.max},
 #endif

diff --git a/fs/xfs/pagebuf/page_buf_internal.h b/fs/xfs/pagebuf/page_buf_internal.h
index 1e9b2c4befc4586de03c9f14b6b38ef08fbb642b..5c79c10d67329c468912d13bd51d9a7d7975c883 100644 (file)
--- a/fs/xfs/pagebuf/page_buf_internal.h
+++ b/fs/xfs/pagebuf/page_buf_internal.h
@@ -81,9 +81,9 @@ struct pagebuf_trace_buf {
  */
 
 typedef struct pb_sysctl_val {
-       ulong min;
-       ulong val;
-       ulong max;
+       int min;
+       int val;
+       int max;
 } pb_sysctl_val_t;
 
 typedef struct pagebuf_param {

diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index bb31038a7c412336830e82c20b668a8c41feee41..b15bc252d2374829f2abf4a871b7193a09d23765 100644 (file)
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -238,7 +238,7 @@ xfs_fs_cmn_err(int level, xfs_mount_t *mp, char *fmt, ...)
 }
 
 void
-xfs_cmn_err(uint64_t panic_tag, int level, xfs_mount_t *mp, char *fmt, ...)
+xfs_cmn_err(int panic_tag, int level, xfs_mount_t *mp, char *fmt, ...)
 {
        va_list ap;
 

diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
index 4d96abd0846a9d5d706d0523f6dbab9a7708ef9c..f9c54f93776c2b659446463328f7cb4ca570a989 100644 (file)
--- a/fs/xfs/xfs_error.h
+++ b/fs/xfs/xfs_error.h
@@ -177,18 +177,18 @@ int               xfs_errortag_clearall_umount(int64_t fsid, char *fsname,
  *                     sysctl.  update xfs_max[XFS_PARAM] if
  *                     more are added.
  */
-#define                XFS_NO_PTAG                     0LL
-#define                XFS_PTAG_IFLUSH                 0x0000000000000001LL
-#define                XFS_PTAG_LOGRES                 0x0000000000000002LL
-#define                XFS_PTAG_AILDELETE              0x0000000000000004LL
-#define                XFS_PTAG_ERROR_REPORT           0x0000000000000008LL
-#define                XFS_PTAG_SHUTDOWN_CORRUPT       0x0000000000000010LL
-#define                XFS_PTAG_SHUTDOWN_IOERROR       0x0000000000000020LL
-#define                XFS_PTAG_SHUTDOWN_LOGERROR      0x0000000000000040LL
+#define                XFS_NO_PTAG                     0
+#define                XFS_PTAG_IFLUSH                 0x00000001
+#define                XFS_PTAG_LOGRES                 0x00000002
+#define                XFS_PTAG_AILDELETE              0x00000004
+#define                XFS_PTAG_ERROR_REPORT           0x00000008
+#define                XFS_PTAG_SHUTDOWN_CORRUPT       0x00000010
+#define                XFS_PTAG_SHUTDOWN_IOERROR       0x00000020
+#define                XFS_PTAG_SHUTDOWN_LOGERROR      0x00000040
 
 struct xfs_mount;
 /* PRINTFLIKE4 */
-void           xfs_cmn_err(uint64_t panic_tag, int level, struct xfs_mount *mp,
+void           xfs_cmn_err(int panic_tag, int level, struct xfs_mount *mp,
                            char *fmt, ...);
 /* PRINTFLIKE3 */
 void           xfs_fs_cmn_err(int level, struct xfs_mount *mp, char *fmt, ...);