diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2018-02-23 13:45:29 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-03-12 10:21:24 -0600 |
| commit | ce3077ee80d6ac1087c06441f4c63ce5f13ef12c (patch) | |
| tree | e02b03b77e82ecbc6bdcb31a260bf5c264273e1d | |
| parent | c8f4c36f81623002165dce874fa60bb0c154b10e (diff) | |
direct-io: Remove unused DIO_SKIP_DIO_COUNT logic
This flag was added by fe0f07d08ee3 ("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 542ff7bf18c6 ("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>
| -rw-r--r-- | fs/direct-io.c | 6 | ||||
| -rw-r--r-- | include/linux/fs.h | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/fs/direct-io.c b/fs/direct-io.c index 88f0c7fba1ce..ba12ee659673 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -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); } - if (!(dio->flags & DIO_SKIP_DIO_COUNT)) - inode_dio_end(dio->inode); + inode_dio_end(dio->inode); 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. */ - if (!(dio->flags & DIO_SKIP_DIO_COUNT)) - inode_dio_begin(inode); + inode_dio_begin(inode); retval = 0; sdio.blkbits = blkbits; diff --git a/include/linux/fs.h b/include/linux/fs.h index 260c233e7375..9bee267209e5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2976,9 +2976,6 @@ enum { /* filesystem does not support filling holes */ DIO_SKIP_HOLES = 0x02, - - /* inode/fs/bdev does not need truncate protection */ - DIO_SKIP_DIO_COUNT = 0x08, }; void dio_end_io(struct bio *bio); |