Subject: afs/fs/cachefs vjournal.c,1.7,1.8 replay.c,1.9,1.10 aops.c,1.49,1.50

From: [email-masked]
Date: Thu, 25 Mar 2004 15:30:05 +0000

Update of /home/cvs/afs/fs/cachefs
In directory phoenix.infradead.org:/tmp/cvs-serv24420/fs/cachefs

Modified Files:
	vjournal.c replay.c aops.c 
Log Message:
kunmap() takes a page as an argument, not a pointer

Index: vjournal.c
===================================================================
RCS file: /home/cvs/afs/fs/cachefs/vjournal.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vjournal.c	15 Sep 2003 13:53:24 -0000	1.7
+++ vjournal.c	25 Mar 2004 15:30:00 -0000	1.8
@@ -532,7 +532,7 @@
 			u8 *data = kmap(step[1].page);
 			step->bix =
 				*(cachefs_blockix_t *)(data + step->offset);
-			kunmap(data);
+			kunmap(step[1].page);
 		}
 
 		/* allocate this block if necessary */

Index: replay.c
===================================================================
RCS file: /home/cvs/afs/fs/cachefs/replay.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- replay.c	16 Sep 2003 15:52:46 -0000	1.9
+++ replay.c	25 Mar 2004 15:30:00 -0000	1.10
@@ -621,7 +621,7 @@
 
 		node = kmap(super->alloc_node);
 		super->alloc_cur_n = node->count;
-		kunmap(node);
+		kunmap(super->alloc_node);
 
 		super->alloc_cur_n +=
 			CACHEFS_ONDISC_LEAVES_PER_FREE_NODE -
@@ -658,7 +658,7 @@
 		super->recycle_cur_n =
 			node->count + super->recycle_room;
 
-		kunmap(node);
+		kunmap(super->recycle_node);
 	}

Index: aops.c
===================================================================
RCS file: /home/cvs/afs/fs/cachefs/aops.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- aops.c	15 Sep 2003 13:53:25 -0000	1.49
+++ aops.c	25 Mar 2004 15:30:00 -0000	1.50
@@ -1018,7 +1018,7 @@
 		jentry->alloc_cur	= node->next;
 		jentry->alloc_leaf	= 0;
 		next_count		= node->count;
-		kunmap(node);
+		kunmap(super->alloc_node);
 
 		alloc2os = jentry->alloc_cur;
 
@@ -1033,7 +1033,7 @@
 		node = kmap(super->alloc_node);
 		jentry->block	= node->leaves[super->alloc_leaf];
 		alloc2os	= node->next;
-		kunmap(node);
+		kunmap(super->alloc_node);
 		BUG_ON(!jentry->block);
 
 		jentry->alloc_cur	= super->alloc_cur;
@@ -1159,7 +1159,7 @@
 
 		data = kmap(step[1].page);
 		*(cachefs_blockix_t *)(data + step->offset) = step->bix;
-		kunmap(data);
+		kunmap(step[1].page);
 	}
 
 	metadata = cachefs_metadata_prewrite(inode);
@@ -1354,7 +1354,7 @@
 			u8 *data = kmap(step[1].page);
 			step->bix =
 				*(cachefs_blockix_t *)(data + step->offset);
-			kunmap(data);
+			kunmap(step[1].page);
 		}
 
 		/* allocate this block if necessary */