patch-1.3.49 linux/fs/buffer.c

Next file: linux/fs/dquot.c
Previous file: linux/drivers/scsi/aic7xxx_proc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.48/linux/fs/buffer.c linux/fs/buffer.c
@@ -662,7 +662,7 @@
 					continue;
 				};
 				
-				if (bh->b_count || bh->b_size != size)
+				if (bh->b_count || buffer_protected(bh) || bh->b_size != size)
 					 continue;
 				
 				/* Buffers are written in the order they are
@@ -838,10 +838,6 @@
 	}
 	if (mem_map[MAP_NR(buf->b_data)].count != 1) {
 		printk("Aieee... bforget(): shared buffer\n");
-		return;
-	}
-	if (buffer_protected(buf)) {
-		printk("Aieee... bforget(): protected buffer\n");
 		return;
 	}
 	mark_buffer_clean(buf);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this