From b5c4e238d38adf76c4648494ae6eeb62345bd086 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 4 Apr 2013 12:59:49 +0200 Subject: block: rename file operation functions block_read and block_write collide with a to-be-introduced global function, so rename the file operation functions. Signed-off-by: Sascha Hauer --- common/block.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'common') diff --git a/common/block.c b/common/block.c index 120d65928e..2cf85ae987 100644 --- a/common/block.c +++ b/common/block.c @@ -176,7 +176,7 @@ static void *block_get(struct block_device *blk, int block) return outdata; } -static ssize_t block_read(struct cdev *cdev, void *buf, size_t count, +static ssize_t block_op_read(struct cdev *cdev, void *buf, size_t count, loff_t offset, unsigned long flags) { struct block_device *blk = cdev->priv; @@ -253,7 +253,7 @@ static int block_put(struct block_device *blk, const void *buf, int block) return 0; } -static ssize_t block_write(struct cdev *cdev, const void *buf, size_t count, +static ssize_t block_op_write(struct cdev *cdev, const void *buf, size_t count, loff_t offset, ulong flags) { struct block_device *blk = cdev->priv; @@ -310,14 +310,14 @@ static ssize_t block_write(struct cdev *cdev, const void *buf, size_t count, } #endif -static int block_close(struct cdev *cdev) +static int block_op_close(struct cdev *cdev) { struct block_device *blk = cdev->priv; return writebuffer_flush(blk); } -static int block_flush(struct cdev *cdev) +static int block_op_flush(struct cdev *cdev) { struct block_device *blk = cdev->priv; @@ -325,12 +325,12 @@ static int block_flush(struct cdev *cdev) } static struct file_operations block_ops = { - .read = block_read, + .read = block_op_read, #ifdef CONFIG_BLOCK_WRITE - .write = block_write, + .write = block_op_write, #endif - .close = block_close, - .flush = block_flush, + .close = block_op_close, + .flush = block_op_flush, .lseek = dev_lseek_default, }; -- cgit v1.2.3