patch-2.3.34 linux/fs/buffer.c

• Lines: 19
• Date: Mon Dec 20 14:52:57 1999
• Orig file: v2.3.33/linux/fs/buffer.c
• Orig date: Tue Dec 14 01:27:24 1999

diff -u --recursive --new-file v2.3.33/linux/fs/buffer.c linux/fs/buffer.c
@@ -727,8 +727,7 @@
 	atomic_dec(&bh->b_count);
 	tmp = bh->b_this_page;
 	while (tmp != bh) {
-		if (atomic_read(&tmp->b_count) &&
-		    (tmp->b_end_io == end_buffer_io_async))
+		if (tmp->b_end_io == end_buffer_io_async && buffer_locked(tmp))
 			goto still_busy;
 		tmp = tmp->b_this_page;
 	}
@@ -1089,7 +1088,7 @@
 	return NULL;
 }
 
-void set_bh_page (struct buffer_head *bh, struct page *page, unsigned int offset)
+void set_bh_page (struct buffer_head *bh, struct page *page, unsigned long offset)
 {
 	bh->b_page = page;
 	if (offset >= PAGE_SIZE)