On Wed 04-07-18 14:40:58, Huaisheng Ye wrote:
> From: Huaisheng Ye <yehs1@xxxxxxxxxx>
>
> Some functions within fs/dax don't need to get gfn from direct_access.
> Assigning NULL to gfn of dax_direct_access is more intuitive and simple
> than offering a useless local variable.
>
> Signed-off-by: Huaisheng Ye <yehs1@xxxxxxxxxx>
I like this. You can add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
for the series.
Honza
> ---
> fs/dax.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/fs/dax.c b/fs/dax.c
> index aaec72de..aa75dfd 100644
> --- a/fs/dax.c
> +++ b/fs/dax.c
> @@ -550,7 +550,6 @@ static int copy_user_dax(struct block_device *bdev, struct dax_device *dax_dev,
> {
> void *vto, *kaddr;
> pgoff_t pgoff;
> - pfn_t pfn;
> long rc;
> int id;
>
> @@ -559,7 +558,7 @@ static int copy_user_dax(struct block_device *bdev, struct dax_device *dax_dev,
> return rc;
>
> id = dax_read_lock();
> - rc = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), &kaddr, &pfn);
> + rc = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), &kaddr, NULL);
> if (rc < 0) {
> dax_read_unlock(id);
> return rc;
> @@ -961,7 +960,6 @@ int __dax_zero_page_range(struct block_device *bdev,
> pgoff_t pgoff;
> long rc, id;
> void *kaddr;
> - pfn_t pfn;
>
> rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff);
> if (rc)
> @@ -969,7 +967,7 @@ int __dax_zero_page_range(struct block_device *bdev,
>
> id = dax_read_lock();
> rc = dax_direct_access(dax_dev, pgoff, 1, &kaddr,
> - &pfn);
> + NULL);
> if (rc < 0) {
> dax_read_unlock(id);
> return rc;
> @@ -1024,7 +1022,6 @@ int __dax_zero_page_range(struct block_device *bdev,
> ssize_t map_len;
> pgoff_t pgoff;
> void *kaddr;
> - pfn_t pfn;
>
> if (fatal_signal_pending(current)) {
> ret = -EINTR;
> @@ -1036,7 +1033,7 @@ int __dax_zero_page_range(struct block_device *bdev,
> break;
>
> map_len = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size),
> - &kaddr, &pfn);
> + &kaddr, NULL);
> if (map_len < 0) {
> ret = map_len;
> break;
> --
> 1.8.3.1
>
>
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
