Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3f68b36 authored by Al Viro's avatar Al Viro
Browse files

[PATCH] switch xyspace 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a63c848b

drivers/block/xsysace.c

+7 −8
Original line number Diff line number Diff line
@@ -870,25 +870,24 @@ static int ace_revalidate_disk(struct gendisk *gd) 
	return ace->id_result;

}



static int ace_open(struct inode *inode, struct file *filp)

static int ace_open(struct block_device *bdev, fmode_t mode)

{

	struct ace_device *ace = inode->i_bdev->bd_disk->private_data;

	struct ace_device *ace = bdev->bd_disk->private_data;

	unsigned long flags;



	dev_dbg(ace->dev, "ace_open() users=%i\n", ace->users + 1);



	filp->private_data = ace;

	spin_lock_irqsave(&ace->lock, flags);

	ace->users++;

	spin_unlock_irqrestore(&ace->lock, flags);



	check_disk_change(inode->i_bdev);

	check_disk_change(bdev);

	return 0;

}



static int ace_release(struct inode *inode, struct file *filp)

static int ace_release(struct gendisk *disk, fmode_t mode)

{

	struct ace_device *ace = inode->i_bdev->bd_disk->private_data;

	struct ace_device *ace = disk->private_data;

	unsigned long flags;

	u16 val;
@@ -919,8 +918,8 @@ static int ace_getgeo(struct block_device *bdev, struct hd_geometry *geo) 


static struct block_device_operations ace_fops = {

	.owner = THIS_MODULE,

	.__open = ace_open,

	.__release = ace_release,

	.open = ace_open,

	.release = ace_release,

	.media_changed = ace_media_changed,

	.revalidate_disk = ace_revalidate_disk,

	.getgeo = ace_getgeo,