Manual merge

fs/jfs/jfs_txnmgr.c

@@ -2755,7 +2755,7 @@ void txLazyCommit(tblock_t * tblk)
  *	context, or where blocking is not wanted, this routine will process
  *	committed transactions from the unlock queue.
  */
-int jfs_lazycommit(void)
+int jfs_lazycommit(void *arg)
 {
 	int WorkDone;
 	tblock_t *tblk;
@@ -2952,7 +2952,7 @@ void txResume(struct super_block *sb)
  *	We write any inodes that have anonymous tlocks so they will become
  *	available.
  */
-int jfs_sync(void)
+int jfs_sync(void *arg)
 {
 	struct inode *ip;
 	struct jfs_inode_info *jfs_ip;

fs/jfs/resize.c

@@ -312,8 +312,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
 	/* compute number of blocks that can be extended by current mapfile */
 	t64 = dbMapFileSizeToMapSize(ipbmap);
 	if (mapSize > t64) {
-		printk(KERN_ERR
-		       "jfs_extendfs: mapSize (0x%llx) > t64 (0x%llx)\n",
+		printk(KERN_ERR "jfs_extendfs: mapSize (0x%Lx) > t64 (0x%Lx)\n",
 		       (long long) mapSize, (long long) t64);
 		rc = EIO;
 		goto error_out;