JFS: cosmetic syncup with 2.4 code

These are cosmetic changes to avoid unneeded diffs between the 2.4
and 2.5 code.  Submitted by Christoph Hellwig

fs/jfs/jfs_dtree.c

@@ -2368,7 +2368,7 @@ int dtRelocate(tid_t tid, struct inode *ip, s64 lmxaddr, pxd_t * opxd,
 	xlen = lengthPXD(opxd);
 
 	jEVENT(0, ("dtRelocate: lmxaddr:%Ld xaddr:%Ld:%Ld xlen:%d\n",
-		   lmxaddr, oxaddr, nxaddr, xlen));
+		   (long long)lmxaddr, (long long)oxaddr, (long long)nxaddr, xlen));
 
 	/*
 	 *      1. get the internal parent dtpage covering
@@ -3044,7 +3044,7 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 				if (d_namleft == 0) {
 					jERROR(1,("JFS:Dtree error: "
 					  "ino = %ld, bn=%Ld, index = %d\n",
-						  ip->i_ino, bn, i));
+						  (long)ip->i_ino, (long long)bn, i));
 					updateSuper(ip->i_sb, FM_DIRTY);
 					goto skip_one;
 				}
@@ -3101,6 +3101,7 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
       out:
 	kfree(d_name);
 	DT_PUTPAGE(mp);
+
 	return rc;
 }
 

fs/jfs/jfs_logmgr.c

@@ -1080,8 +1080,8 @@ int lmLogOpen(struct super_block *sb, log_t ** logptr)
 	 * 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);

fs/jfs/jfs_mount.c

@@ -426,14 +426,15 @@ static int chkSuper(struct super_block *sb)
  */
 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 @@ int updateSuper(struct super_block *sb, uint state)
 	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