[PATCH] syncup 2.5 with cosmetic 2.4 changes

... or whatever way it was.  at least kill those unneeded diffs.


Index: fs/jfs/jfs_dtree.c
===================================================================
RCS file: /usr/cvs/jfs/linux25/fs/jfs/jfs_dtree.c,v
retrieving revision 1.20
diff -u -r1.20 jfs_dtree.c
--- fs/jfs/jfs_dtree.c	29 May 2002 18:43:46 -0000	1.20
+++ fs/jfs/jfs_dtree.c	14 Jul 2002 14:25:40 -0000
@@ -2368,7 +2368,7 @@
 	xlen = lengthPXD(opxd);
 
 	jEVENT(0, ("dtRelocate: lmxaddr:%Ld xaddr:%Ld:%Ld xlen:%d\n",
-		   (long long) lmxaddr, (long long) oxaddr, (long long) nxaddr, xlen));
+		   (long long)lmxaddr, (long long)oxaddr, (long long)nxaddr, xlen));
 
 	/*
 	 *      1. get the internal parent dtpage covering
@@ -3044,7 +3044,7 @@
 				if (d_namleft == 0) {
 					jERROR(1,("JFS:Dtree error: "
 					  "ino = %ld, bn=%Ld, index = %d\n",
-						  (long) ip->i_ino, (long long) bn, i));
+						  (long)ip->i_ino, (long long)bn, i));
 					updateSuper(ip->i_sb, FM_DIRTY);
 					goto skip_one;
 				}
@@ -3101,6 +3101,7 @@
       out:
 	kfree(d_name);
 	DT_PUTPAGE(mp);
+
 	return rc;
 }
 
Index: fs/jfs/jfs_logmgr.c
===================================================================
RCS file: /usr/cvs/jfs/linux25/fs/jfs/jfs_logmgr.c,v
retrieving revision 1.34
diff -u -r1.34 jfs_logmgr.c
--- fs/jfs/jfs_logmgr.c	10 Jul 2002 16:01:16 -0000	1.34
+++ fs/jfs/jfs_logmgr.c	14 Jul 2002 14:25:42 -0000
@@ -1080,8 +1080,8 @@
 	 * file system to log have 1-to-1 relationship;
 	 */
 
-	log->bdev = sb->s_bdev;
 	log->flag = JFS_INLINELOG;
+	log->bdev = sb->s_bdev;
 	log->base = addressPXD(&JFS_SBI(sb)->logpxd);
 	log->size = lengthPXD(&JFS_SBI(sb)->logpxd) >>
 	    (L2LOGPSIZE - sb->s_blocksize_bits);
Index: fs/jfs/jfs_mount.c
===================================================================
RCS file: /usr/cvs/jfs/linux25/fs/jfs/jfs_mount.c,v
retrieving revision 1.10
diff -u -r1.10 jfs_mount.c
--- fs/jfs/jfs_mount.c	10 Jul 2002 16:01:16 -0000	1.10
+++ fs/jfs/jfs_mount.c	14 Jul 2002 14:25:43 -0000
@@ -426,14 +426,15 @@
  */
 int updateSuper(struct super_block *sb, uint state)
 {
-	int rc;
-	metapage_t *mp;
 	struct jfs_superblock *j_sb;
+	struct jfs_sb_info *sbi = JFS_SBI(sb);
+	metapage_t *mp;
+	int rc;
 
 	/*
 	 * Only fsck can fix dirty state
 	 */
-	if (JFS_SBI(sb)->state == FM_DIRTY)
+	if (sbi->state == FM_DIRTY)
 		return 0;
 
 	if ((rc = readSuper(sb, &mp)))
@@ -442,13 +443,12 @@
 	j_sb = (struct jfs_superblock *) (mp->data);
 
 	j_sb->s_state = cpu_to_le32(state);
-	JFS_SBI(sb)->state = state;
+	sbi->state = state;
 
 	if (state == FM_MOUNT) {
 		/* record log's dev_t and mount serial number */
-		j_sb->s_logdev =
-			cpu_to_le32(JFS_SBI(sb)->log->bdev->bd_dev);
-		j_sb->s_logserial = cpu_to_le32(JFS_SBI(sb)->log->serial);
+		j_sb->s_logdev = cpu_to_le32(sbi->log->bdev->bd_dev);
+		j_sb->s_logserial = cpu_to_le32(sbi->log->serial);
 	} else if (state == FM_CLEAN) {
 		/*
 		 * If this volume is shared with OS/2, OS/2 will need to