* [PATCH] block_dev: remove DAX leftovers
@ 2016-09-14 9:56 ` Christoph Hellwig
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Hellwig @ 2016-09-14 9:56 UTC (permalink / raw)
To: axboe-tSWWG44O7X1aa/9Udqfwiw, ross.zwisler-VuQAYsv1563Yd54FQh9/CA
Cc: linux-block-u79uwXL29TY76Z2rM5mHXA, linux-nvdimm-y27Ovi1pjclAfugRpC6u6w
DAX support for block devices was removed in commits 03cdad
("block: disable block device DAX by default") and 99a01cd
("block: remove BLK_DEV_DAX config option"), but we still kept a call to
dax_do_io and some uneeded i_flags manipulations introduced in commit
bbab37 ("block: Add support for DAX reads/writes to block devices").
Remove those leftovers.
Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
---
fs/block_dev.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index c3cdde8..45f5491 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -180,9 +180,6 @@ blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
struct file *file = iocb->ki_filp;
struct inode *inode = bdev_file_inode(file);
- if (IS_DAX(inode))
- return dax_do_io(iocb, inode, iter, blkdev_get_block,
- NULL, DIO_SKIP_DIO_COUNT);
return __blockdev_direct_IO(iocb, inode, I_BDEV(inode), iter,
blkdev_get_block, NULL, NULL,
DIO_SKIP_DIO_COUNT);
@@ -1274,7 +1271,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
bdev->bd_disk = disk;
bdev->bd_queue = disk->queue;
bdev->bd_contains = bdev;
- bdev->bd_inode->i_flags = 0;
if (!partno) {
ret = -ENXIO;
@@ -1302,11 +1298,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
}
}
- if (!ret) {
+ if (!ret)
bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
- if (!bdev_dax_capable(bdev))
- bdev->bd_inode->i_flags &= ~S_DAX;
- }
/*
* If the device is invalidated, rescan partition
@@ -1341,8 +1334,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
goto out_clear;
}
bd_set_size(bdev, (loff_t)bdev->bd_part->nr_sects << 9);
- if (!bdev_dax_capable(bdev))
- bdev->bd_inode->i_flags &= ~S_DAX;
}
} else {
if (bdev->bd_contains == bdev) {
--
2.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH] block_dev: remove DAX leftovers
@ 2016-09-14 9:56 ` Christoph Hellwig
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Hellwig @ 2016-09-14 9:56 UTC (permalink / raw)
To: axboe, ross.zwisler; +Cc: linux-nvdimm, linux-block
DAX support for block devices was removed in commits 03cdad
("block: disable block device DAX by default") and 99a01cd
("block: remove BLK_DEV_DAX config option"), but we still kept a call to
dax_do_io and some uneeded i_flags manipulations introduced in commit
bbab37 ("block: Add support for DAX reads/writes to block devices").
Remove those leftovers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/block_dev.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index c3cdde8..45f5491 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -180,9 +180,6 @@ blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
struct file *file = iocb->ki_filp;
struct inode *inode = bdev_file_inode(file);
- if (IS_DAX(inode))
- return dax_do_io(iocb, inode, iter, blkdev_get_block,
- NULL, DIO_SKIP_DIO_COUNT);
return __blockdev_direct_IO(iocb, inode, I_BDEV(inode), iter,
blkdev_get_block, NULL, NULL,
DIO_SKIP_DIO_COUNT);
@@ -1274,7 +1271,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
bdev->bd_disk = disk;
bdev->bd_queue = disk->queue;
bdev->bd_contains = bdev;
- bdev->bd_inode->i_flags = 0;
if (!partno) {
ret = -ENXIO;
@@ -1302,11 +1298,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
}
}
- if (!ret) {
+ if (!ret)
bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
- if (!bdev_dax_capable(bdev))
- bdev->bd_inode->i_flags &= ~S_DAX;
- }
/*
* If the device is invalidated, rescan partition
@@ -1341,8 +1334,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
goto out_clear;
}
bd_set_size(bdev, (loff_t)bdev->bd_part->nr_sects << 9);
- if (!bdev_dax_capable(bdev))
- bdev->bd_inode->i_flags &= ~S_DAX;
}
} else {
if (bdev->bd_contains == bdev) {
--
2.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] block_dev: remove DAX leftovers
2016-09-14 9:56 ` Christoph Hellwig
@ 2016-09-14 10:57 ` Johannes Thumshirn
-1 siblings, 0 replies; 7+ messages in thread
From: Johannes Thumshirn @ 2016-09-14 10:57 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: axboe, ross.zwisler, linux-block, linux-nvdimm
On Wed, Sep 14, 2016 at 11:56:13AM +0200, Christoph Hellwig wrote:
> DAX support for block devices was removed in commits 03cdad
> ("block: disable block device DAX by default") and 99a01cd
> ("block: remove BLK_DEV_DAX config option"), but we still kept a call to
> dax_do_io and some uneeded i_flags manipulations introduced in commit
> bbab37 ("block: Add support for DAX reads/writes to block devices").
>
> Remove those leftovers.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
--
Johannes Thumshirn Storage
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] block_dev: remove DAX leftovers
@ 2016-09-14 10:57 ` Johannes Thumshirn
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Thumshirn @ 2016-09-14 10:57 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: axboe, ross.zwisler, linux-block, linux-nvdimm
On Wed, Sep 14, 2016 at 11:56:13AM +0200, Christoph Hellwig wrote:
> DAX support for block devices was removed in commits 03cdad
> ("block: disable block device DAX by default") and 99a01cd
> ("block: remove BLK_DEV_DAX config option"), but we still kept a call to
> dax_do_io and some uneeded i_flags manipulations introduced in commit
> bbab37 ("block: Add support for DAX reads/writes to block devices").
>
> Remove those leftovers.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
--
Johannes Thumshirn Storage
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N�rnberg
GF: Felix Imend�rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N�rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] block_dev: remove DAX leftovers
2016-09-14 9:56 ` Christoph Hellwig
(?)
(?)
@ 2016-09-14 14:12 ` Dan Williams
-1 siblings, 0 replies; 7+ messages in thread
From: Dan Williams @ 2016-09-14 14:12 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: Jens Axboe, Ross Zwisler, linux-block, linux-nvdimm
On Wed, Sep 14, 2016 at 2:56 AM, Christoph Hellwig <hch@lst.de> wrote:
> DAX support for block devices was removed in commits 03cdad
> ("block: disable block device DAX by default") and 99a01cd
> ("block: remove BLK_DEV_DAX config option"), but we still kept a call to
> dax_do_io and some uneeded i_flags manipulations introduced in commit
> bbab37 ("block: Add support for DAX reads/writes to block devices").
>
> Remove those leftovers.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Dan Williams <dan.j.williams@intel.com>
^ permalink raw reply [flat|nested] 7+ messages in thread[parent not found: <1473846973-18798-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>]
* Re: [PATCH] block_dev: remove DAX leftovers
2016-09-14 9:56 ` Christoph Hellwig
@ 2016-09-14 14:42 ` Jens Axboe
-1 siblings, 0 replies; 7+ messages in thread
From: Jens Axboe @ 2016-09-14 14:42 UTC (permalink / raw)
To: Christoph Hellwig, ross.zwisler-VuQAYsv1563Yd54FQh9/CA
Cc: linux-block-u79uwXL29TY76Z2rM5mHXA, linux-nvdimm-y27Ovi1pjclAfugRpC6u6w
On 09/14/2016 03:56 AM, Christoph Hellwig wrote:
> DAX support for block devices was removed in commits 03cdad
> ("block: disable block device DAX by default") and 99a01cd
> ("block: remove BLK_DEV_DAX config option"), but we still kept a call to
> dax_do_io and some uneeded i_flags manipulations introduced in commit
> bbab37 ("block: Add support for DAX reads/writes to block devices").
Applied for 4.9, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] block_dev: remove DAX leftovers
@ 2016-09-14 14:42 ` Jens Axboe
0 siblings, 0 replies; 7+ messages in thread
From: Jens Axboe @ 2016-09-14 14:42 UTC (permalink / raw)
To: Christoph Hellwig, ross.zwisler; +Cc: linux-nvdimm, linux-block
On 09/14/2016 03:56 AM, Christoph Hellwig wrote:
> DAX support for block devices was removed in commits 03cdad
> ("block: disable block device DAX by default") and 99a01cd
> ("block: remove BLK_DEV_DAX config option"), but we still kept a call to
> dax_do_io and some uneeded i_flags manipulations introduced in commit
> bbab37 ("block: Add support for DAX reads/writes to block devices").
Applied for 4.9, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-09-14 14:42 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-14 9:56 [PATCH] block_dev: remove DAX leftovers Christoph Hellwig
2016-09-14 9:56 ` Christoph Hellwig
2016-09-14 10:57 ` Johannes Thumshirn
2016-09-14 10:57 ` Johannes Thumshirn
2016-09-14 14:12 ` Dan Williams
[not found] ` <1473846973-18798-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2016-09-14 14:42 ` Jens Axboe
2016-09-14 14:42 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.