Merge bk://jfs.bkbits.net/linux-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

fs/jfs/inode.c

@@ -18,6 +18,7 @@
  */
 
 #include <linux/fs.h>
+#include <linux/mpage.h>
 #include <linux/buffer_head.h>
 #include "jfs_incore.h"
 #include "jfs_filsys.h"
@@ -271,9 +272,20 @@ static int jfs_writepage(struct page *page)
 	return block_write_full_page(page, jfs_get_block);
 }
 
+static int jfs_writepages(struct address_space *mapping, int *nr_to_write)
+{
+	return mpage_writepages(mapping, nr_to_write, jfs_get_block);
+}
+
 static int jfs_readpage(struct file *file, struct page *page)
 {
-	return block_read_full_page(page, jfs_get_block);
+	return mpage_readpage(page, jfs_get_block);
+}
+
+static int jfs_readpages(struct address_space *mapping,
+		struct list_head *pages, unsigned nr_pages)
+{
+	return mpage_readpages(mapping, pages, nr_pages, jfs_get_block);
 }
 
 static int jfs_prepare_write(struct file *file,
@@ -308,7 +320,9 @@ static int jfs_direct_IO(int rw, struct inode *inode, char *buf,
 
 struct address_space_operations jfs_aops = {
 	.readpage	= jfs_readpage,
+	.readpages	= jfs_readpages,
 	.writepage	= jfs_writepage,
+	.writepages	= jfs_writepages,
 	.sync_page	= block_sync_page,
 	.prepare_write	= jfs_prepare_write,
 	.commit_write	= generic_commit_write,

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;