tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[PATCH] switch xyspace
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+7
-8
+7
-8
drivers/block/xsysace.c
+7
-8
drivers/block/xsysace.c
···
870
870
return ace->id_result;
871
871
}
872
872
873
-
static int ace_open(struct inode *inode, struct file *filp)
873
+
static int ace_open(struct block_device *bdev, fmode_t mode)
874
874
{
875
-
struct ace_device *ace = inode->i_bdev->bd_disk->private_data;
875
+
struct ace_device *ace = bdev->bd_disk->private_data;
876
876
unsigned long flags;
877
877
878
878
dev_dbg(ace->dev, "ace_open() users=%i\n", ace->users + 1);
879
879
880
-
filp->private_data = ace;
881
880
spin_lock_irqsave(&ace->lock, flags);
882
881
ace->users++;
883
882
spin_unlock_irqrestore(&ace->lock, flags);
884
883
885
-
check_disk_change(inode->i_bdev);
884
+
check_disk_change(bdev);
886
885
return 0;
887
886
}
888
887
889
-
static int ace_release(struct inode *inode, struct file *filp)
888
+
static int ace_release(struct gendisk *disk, fmode_t mode)
890
889
{
891
-
struct ace_device *ace = inode->i_bdev->bd_disk->private_data;
890
+
struct ace_device *ace = disk->private_data;
892
891
unsigned long flags;
893
892
u16 val;
894
893
···
918
919
919
920
static struct block_device_operations ace_fops = {
920
921
.owner = THIS_MODULE,
921
-
.__open = ace_open,
922
-
.__release = ace_release,
922
+
.open = ace_open,
923
+
.release = ace_release,
923
924
.media_changed = ace_media_changed,
924
925
.revalidate_disk = ace_revalidate_disk,
925
926
.getgeo = ace_getgeo,