patch-2.3.1 linux/fs/hfs/catalog.c

Next file: linux/fs/hfs/dir.c
Previous file: linux/fs/hfs/btree.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.0/linux/fs/hfs/catalog.c linux/fs/hfs/catalog.c
@@ -647,7 +647,7 @@
  */
 static inline void start_write(struct hfs_cat_entry *dir)
 {
-	if (dir->u.dir.readers || dir->u.dir.read_wait) {
+	if (dir->u.dir.readers || wait_queue_active(&dir->u.dir.read_wait)) {
 		hfs_sleep_on(&dir->u.dir.write_wait);
 	}
 	++dir->u.dir.writers;
@@ -658,7 +658,7 @@
  */
 static inline void start_read(struct hfs_cat_entry *dir)
 {
-	if (dir->u.dir.writers || dir->u.dir.write_wait) {
+	if (dir->u.dir.writers || wait_queue_active(&dir->u.dir.write_wait)) {
 		hfs_sleep_on(&dir->u.dir.read_wait);
 	}
 	++dir->u.dir.readers;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)