Merge kernel.bkbits.net:/home/repos/linux-2.5

into kernel.bkbits.net:/home/lord/xfs-2.6

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 */

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 {

fs/xfs/linux/xfs_vnode.c

@@ -200,7 +200,7 @@ vn_revalidate(
 	vn_trace_entry(vp, "vn_revalidate", (inst_t *)__return_address);
 	ASSERT(vp->v_fbhv != NULL);
 
-	va.va_mask = XFS_AT_STAT;
+	va.va_mask = XFS_AT_STAT|XFS_AT_GENCOUNT;
 	VOP_GETATTR(vp, &va, 0, NULL, error);
 	if (!error) {
 		inode = LINVFS_GET_IP(vp);

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

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 {

fs/xfs/xfs_da_btree.c

@@ -2166,9 +2166,9 @@ xfs_da_do_buf(
 			if (xfs_error_level >= XFS_ERRLEVEL_LOW) {
 				int	i;
 				cmn_err(CE_ALERT, "xfs_da_do_buf: bno %lld\n",
-					bno);
+					(long long)bno);
 				cmn_err(CE_ALERT, "dir: inode %lld\n",
-					dp->i_ino);
+					(long long)dp->i_ino);
 				for (i = 0; i < nmap; i++) {
 					cmn_err(CE_ALERT,
 						"[%02d] br_startoff %lld br_startblock %lld br_blockcount %lld br_state %d\n",

fs/xfs/xfs_dir2_node.c

@@ -1612,7 +1612,8 @@ xfs_dir2_node_addname_int(
 			if (XFS_DIR2_DB_TO_FDB(mp, dbno) != fbno) {
 				cmn_err(CE_ALERT,
 		"xfs_dir2_node_addname_int: needed block %lld, got %lld\n",
-					XFS_DIR2_DB_TO_FDB(mp, dbno), fbno);
+					(long long)XFS_DIR2_DB_TO_FDB(mp, dbno),
+					(long long)fbno);
 				XFS_ERROR_REPORT("xfs_dir2_node_addname_int",
 						 XFS_ERRLEVEL_LOW, mp);
 				return XFS_ERROR(EFSCORRUPTED);

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;
 

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, ...);

fs/xfs/xfs_inode.c

@@ -3672,7 +3672,7 @@ xfs_ichgtime(xfs_inode_t *ip,
 	SYNCHRONIZE();
 	ip->i_update_core = 1;
 	if (!(inode->i_state & I_LOCK))
-		mark_inode_dirty(inode);
+		mark_inode_dirty_sync(inode);
 }
 
 #ifdef XFS_ILOCK_TRACE