patch-2.4.0-test3 linux/fs/block_dev.c

• Lines: 54
• Date: Sat Jul 8 19:26:12 2000
• Orig file: v2.4.0-test2/linux/fs/block_dev.c
• Orig date: Mon Jun 19 16:32:00 2000

diff -u --recursive --new-file v2.4.0-test2/linux/fs/block_dev.c linux/fs/block_dev.c
@@ -11,6 +11,7 @@
 #include <linux/malloc.h>
 #include <linux/kmod.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 
@@ -313,7 +314,7 @@
  *	since the vma has no handle.
  */
  
-static int block_fsync(struct file *filp, struct dentry *dentry)
+static int block_fsync(struct file *filp, struct dentry *dentry, int datasync)
 {
 	return fsync_dev(dentry->d_inode->i_rdev);
 }
@@ -528,7 +529,7 @@
 	if (bdops == NULL) {
 		devfs_handle_t de;
 
-		de = devfs_find_handle (NULL, NULL, 0, i, MINOR (dev),
+		de = devfs_find_handle (NULL, NULL, i, MINOR (dev),
 					DEVFS_SPECIAL_BLK, 0);
 		if (de) bdops = devfs_get_ops (de);
 	}
@@ -597,6 +598,8 @@
 				ret = bdev->bd_op->open(fake_inode, &fake_file);
 			if (!ret)
 				atomic_inc(&bdev->bd_openers);
+			else if (!atomic_read(&bdev->bd_openers))
+				bdev->bd_op = NULL;
 			iput(fake_inode);
 		}
 	}
@@ -609,6 +612,7 @@
 	int ret = -ENODEV;
 	struct block_device *bdev = inode->i_bdev;
 	down(&bdev->bd_sem);
+	lock_kernel();
 	if (!bdev->bd_op)
 		bdev->bd_op = get_blkfops(MAJOR(inode->i_rdev));
 	if (bdev->bd_op) {
@@ -617,7 +621,10 @@
 			ret = bdev->bd_op->open(inode,filp);
 		if (!ret)
 			atomic_inc(&bdev->bd_openers);
+		else if (!atomic_read(&bdev->bd_openers))
+			bdev->bd_op = NULL;
 	}	
+	unlock_kernel();
 	up(&bdev->bd_sem);
 	return ret;
 }