leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

direct-io: Remove unused DIO_SKIP_DIO_COUNT logic

Browse Source 
This flag was added by fe0f07d08e ("direct-io: only inc/deci
inode->i_dio_count for file systems") as means to optimise the atomic
modificaiton of the variable for blockdevices. However with the advent
of 542ff7bf18 ("block: new direct I/O implementation") it became
unused. So let's remove it.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Nikolay Borisov 2018-02-23 13:45:29 +02:00 committed by Jens Axboe
parent c8f4c36f81
commit ce3077ee80
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/direct-io.c
View File

@ -315,8 +315,7 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, unsigned int flags)
dio_warn_stale_pagecache(dio->iocb->ki_filp); dio_warn_stale_pagecache(dio->iocb->ki_filp);
} }
if (!(dio->flags & DIO_SKIP_DIO_COUNT)) inode_dio_end(dio->inode);
inode_dio_end(dio->inode);
if (flags & DIO_COMPLETE_ASYNC) { if (flags & DIO_COMPLETE_ASYNC) {
/* /*
@ -1296,8 +1295,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
/* /*
* Will be decremented at I/O completion time. * Will be decremented at I/O completion time.
*/ */
if (!(dio->flags & DIO_SKIP_DIO_COUNT)) inode_dio_begin(inode);
inode_dio_begin(inode);
retval = 0; retval = 0;
sdio.blkbits = blkbits; sdio.blkbits = blkbits;

3
include/linux/fs.h
View File

@ -2976,9 +2976,6 @@ enum {
/* filesystem does not support filling holes */ /* filesystem does not support filling holes */
DIO_SKIP_HOLES = 0x02, DIO_SKIP_HOLES = 0x02,
/* inode/fs/bdev does not need truncate protection */
DIO_SKIP_DIO_COUNT = 0x08,
}; };
void dio_end_io(struct bio *bio); void dio_end_io(struct bio *bio);