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

Commit 4ebb16ca authored by Dan Williams's avatar Dan Williams
Browse files

block: introduce bdev_file_inode() 



Similar to the file_inode() helper, provide a helper to lookup the inode for a
raw block device itself.

Cc: Al Viro <viro@zeniv.linux.org.uk>
Suggested-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJeff Moyer <jmoyer@redhat.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 90a545e9

fs/block_dev.c

+12 −7
Original line number Original line Diff line number Diff line
@@ -156,11 +156,16 @@ blkdev_get_block(struct inode *inode, sector_t iblock, 
	return 0;

	return 0;

}

}





static struct inode *bdev_file_inode(struct file *file)

{

	return file->f_mapping->host;

}



static ssize_t

static ssize_t

blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)

blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)

{

{

	struct file *file = iocb->ki_filp;

	struct file *file = iocb->ki_filp;

	struct inode *inode = file->f_mapping->host;

	struct inode *inode = bdev_file_inode(file);





	if (IS_DAX(inode))

	if (IS_DAX(inode))

		return dax_do_io(iocb, inode, iter, offset, blkdev_get_block,

		return dax_do_io(iocb, inode, iter, offset, blkdev_get_block,
@@ -338,7 +343,7 @@ static int blkdev_write_end(struct file *file, struct address_space *mapping, 
 */

 */

static loff_t block_llseek(struct file *file, loff_t offset, int whence)

static loff_t block_llseek(struct file *file, loff_t offset, int whence)

{

{

	struct inode *bd_inode = file->f_mapping->host;

	struct inode *bd_inode = bdev_file_inode(file);

	loff_t retval;

	loff_t retval;





	mutex_lock(&bd_inode->i_mutex);

	mutex_lock(&bd_inode->i_mutex);
@@ -349,7 +354,7 @@ static loff_t block_llseek(struct file *file, loff_t offset, int whence) 
	

	

int blkdev_fsync(struct file *filp, loff_t start, loff_t end, int datasync)

int blkdev_fsync(struct file *filp, loff_t start, loff_t end, int datasync)

{

{

	struct inode *bd_inode = filp->f_mapping->host;

	struct inode *bd_inode = bdev_file_inode(filp);

	struct block_device *bdev = I_BDEV(bd_inode);

	struct block_device *bdev = I_BDEV(bd_inode);

	int error;

	int error;
@@ -1605,14 +1610,14 @@ EXPORT_SYMBOL(blkdev_put); 




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

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

{

{

	struct block_device *bdev = I_BDEV(filp->f_mapping->host);

	struct block_device *bdev = I_BDEV(bdev_file_inode(filp));

	blkdev_put(bdev, filp->f_mode);

	blkdev_put(bdev, filp->f_mode);

	return 0;

	return 0;

}

}





static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg)

static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg)

{

{

	struct block_device *bdev = I_BDEV(file->f_mapping->host);

	struct block_device *bdev = I_BDEV(bdev_file_inode(file));

	fmode_t mode = file->f_mode;

	fmode_t mode = file->f_mode;





	/*

	/*
@@ -1637,7 +1642,7 @@ static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)

ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)

{

{

	struct file *file = iocb->ki_filp;

	struct file *file = iocb->ki_filp;

	struct inode *bd_inode = file->f_mapping->host;

	struct inode *bd_inode = bdev_file_inode(file);

	loff_t size = i_size_read(bd_inode);

	loff_t size = i_size_read(bd_inode);

	struct blk_plug plug;

	struct blk_plug plug;

	ssize_t ret;

	ssize_t ret;
@@ -1669,7 +1674,7 @@ EXPORT_SYMBOL_GPL(blkdev_write_iter); 
ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to)

ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to)

{

{

	struct file *file = iocb->ki_filp;

	struct file *file = iocb->ki_filp;

	struct inode *bd_inode = file->f_mapping->host;

	struct inode *bd_inode = bdev_file_inode(file);

	loff_t size = i_size_read(bd_inode);

	loff_t size = i_size_read(bd_inode);

	loff_t pos = iocb->ki_pos;

	loff_t pos = iocb->ki_pos;