patch-2.1.34 linux/fs/buffer.c

• Lines: 45
• Date: Mon Apr 14 09:31:09 1997
• Orig file: v2.1.33/linux/fs/buffer.c
• Orig date: Mon Apr 7 11:35:30 1997

diff -u --recursive --new-file v2.1.33/linux/fs/buffer.c linux/fs/buffer.c
@@ -583,7 +583,7 @@
 	    buffer_protected(bh) || buffer_locked(bh))
 		return 0;
 			 
-	if (mem_map[MAP_NR((unsigned long) bh->b_data)].count != 1 ||
+	if (atomic_read(&mem_map[MAP_NR((unsigned long) bh->b_data)].count) != 1 ||
 	    buffer_dirty(bh)) {
 		refile_buffer(bh);
 		return 0;
@@ -1304,7 +1304,7 @@
 	int *p, nr[PAGE_SIZE/512];
 	int i;
 
-	page->count++;
+	atomic_inc(&page->count);
 	set_bit(PG_locked, &page->flags);
 	set_bit(PG_free_after, &page->flags);
 	
@@ -1426,7 +1426,7 @@
 	buffermem -= PAGE_SIZE;
 	mem_map[MAP_NR(page)].buffers = NULL;
 	free_page(page);
-	return !mem_map[MAP_NR(page)].count;
+	return !atomic_read(&mem_map[MAP_NR(page)].count);
 }
 
 /* ================== Debugging =================== */
@@ -1536,7 +1536,7 @@
 		ndirty = 0;
 		nwritten = 0;
 	repeat:
-	
+
 		bh = lru_list[nlist];
 		if(bh) 
 			 for (i = nr_buffers_type[nlist]; i-- > 0; bh = next) {
@@ -1678,7 +1678,7 @@
 			 ndirty = 0;
 			 refilled = 0;
 		 repeat:
-		 	
+
 			 bh = lru_list[nlist];
 			 if(bh) 
 				  for (i = nr_buffers_type[nlist]; i-- > 0 && ndirty < bdf_prm.b_un.ndirty;