All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Toshi Kani <toshi.kani@hpe.com>
Cc: dan.j.williams@intel.com, jack@suse.cz, david@fromorbit.com,
	viro@zeniv.linux.org.uk, axboe@fb.com, hch@infradead.org,
	boaz@plexistor.com, tytso@mit.edu, adilger.kernel@dilger.ca,
	ross.zwisler@linux.intel.com, micah.parrish@hpe.com,
	linux-nvdimm@lists.01.org, linux-fsdevel@vger.kernel.org,
	linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] remove unused blkdev_dax_capable() function
Date: Wed, 18 May 2016 09:54:08 +0200	[thread overview]
Message-ID: <3280835.MNk2ItMooy@wuerfel> (raw)
In-Reply-To: <1462897437-16626-7-git-send-email-toshi.kani@hpe.com>

The change from blkdev_dax_capable() to bdev_dax_capable() removed the only user
of the former, so we now get a build warning:

fs/block_dev.c:1244:13: error: 'blkdev_dax_capable' defined but not used [-Werror=unused-function]
 static bool blkdev_dax_capable(struct block_device *bdev)

This removes the now-unused function.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: a8078b1fc616 ("block: Update blkdev_dax_capable() for consistency")
---
On Tuesday 10 May 2016 10:23:57 Toshi Kani wrote:
> @@ -1295,7 +1330,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
>  
>                         if (!ret) {
>                                 bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
> -                               if (!blkdev_dax_capable(bdev))
> +                               if (!bdev_dax_capable(bdev))
>                                         bdev->bd_inode->i_flags &= ~S_DAX;
> 

It's not entirely from the patch description what the intention was here
in keeping two slightly different implementations of the same function
in one file, my best guess is that it was not intentional and we should
just remove this.

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 97f324642b5f..dad77225a721 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1241,33 +1241,6 @@ void bd_set_size(struct block_device *bdev, loff_t size)
 }
 EXPORT_SYMBOL(bd_set_size);
 
-static bool blkdev_dax_capable(struct block_device *bdev)
-{
-	struct gendisk *disk = bdev->bd_disk;
-
-	if (!disk->fops->direct_access || !IS_ENABLED(CONFIG_FS_DAX))
-		return false;
-
-	/*
-	 * If the partition is not aligned on a page boundary, we can't
-	 * do dax I/O to it.
-	 */
-	if ((bdev->bd_part->start_sect % (PAGE_SIZE / 512))
-			|| (bdev->bd_part->nr_sects % (PAGE_SIZE / 512)))
-		return false;
-
-	/*
-	 * If the device has known bad blocks, force all I/O through the
-	 * driver / page cache.
-	 *
-	 * TODO: support finer grained dax error handling
-	 */
-	if (disk->bb && disk->bb->count)
-		return false;
-
-	return true;
-}
-
 static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part);
 
 /*

WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: Toshi Kani <toshi.kani@hpe.com>
Cc: dan.j.williams@intel.com, jack@suse.cz, david@fromorbit.com,
	viro@zeniv.linux.org.uk, axboe@fb.com, hch@infradead.org,
	boaz@plexistor.com, tytso@mit.edu, adilger.kernel@dilger.ca,
	ross.zwisler@linux.intel.com, micah.parrish@hpe.com,
	linux-nvdimm@ml01.01.org, linux-fsdevel@vger.kernel.org,
	linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] remove unused blkdev_dax_capable() function
Date: Wed, 18 May 2016 09:54:08 +0200	[thread overview]
Message-ID: <3280835.MNk2ItMooy@wuerfel> (raw)
In-Reply-To: <1462897437-16626-7-git-send-email-toshi.kani@hpe.com>

The change from blkdev_dax_capable() to bdev_dax_capable() removed the only user
of the former, so we now get a build warning:

fs/block_dev.c:1244:13: error: 'blkdev_dax_capable' defined but not used [-Werror=unused-function]
 static bool blkdev_dax_capable(struct block_device *bdev)

This removes the now-unused function.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: a8078b1fc616 ("block: Update blkdev_dax_capable() for consistency")
---
On Tuesday 10 May 2016 10:23:57 Toshi Kani wrote:
> @@ -1295,7 +1330,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
>  
>                         if (!ret) {
>                                 bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
> -                               if (!blkdev_dax_capable(bdev))
> +                               if (!bdev_dax_capable(bdev))
>                                         bdev->bd_inode->i_flags &= ~S_DAX;
> 

It's not entirely from the patch description what the intention was here
in keeping two slightly different implementations of the same function
in one file, my best guess is that it was not intentional and we should
just remove this.

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 97f324642b5f..dad77225a721 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1241,33 +1241,6 @@ void bd_set_size(struct block_device *bdev, loff_t size)
 }
 EXPORT_SYMBOL(bd_set_size);
 
-static bool blkdev_dax_capable(struct block_device *bdev)
-{
-	struct gendisk *disk = bdev->bd_disk;
-
-	if (!disk->fops->direct_access || !IS_ENABLED(CONFIG_FS_DAX))
-		return false;
-
-	/*
-	 * If the partition is not aligned on a page boundary, we can't
-	 * do dax I/O to it.
-	 */
-	if ((bdev->bd_part->start_sect % (PAGE_SIZE / 512))
-			|| (bdev->bd_part->nr_sects % (PAGE_SIZE / 512)))
-		return false;
-
-	/*
-	 * If the device has known bad blocks, force all I/O through the
-	 * driver / page cache.
-	 *
-	 * TODO: support finer grained dax error handling
-	 */
-	if (disk->bb && disk->bb->count)
-		return false;
-
-	return true;
-}
-
 static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part);
 
 /*

  parent reply	other threads:[~2016-05-18  7:54 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-10 16:23 [PATCH v4 0/6] Add alignment check for DAX mount Toshi Kani
2016-05-10 16:23 ` Toshi Kani
2016-05-10 16:23 ` Toshi Kani
2016-05-10 16:23 ` [PATCH v4 1/6] block: Add vfs_msg() interface Toshi Kani
2016-05-10 16:23   ` Toshi Kani
2016-05-10 16:23   ` Toshi Kani
2016-05-10 16:23 ` [PATCH v4 2/6] block: Add bdev_dax_supported() for dax mount checks Toshi Kani
2016-05-10 16:23   ` Toshi Kani
2016-05-10 16:23   ` Toshi Kani
2016-05-10 16:23 ` [PATCH v4 3/6] ext4: Add alignment check for DAX mount Toshi Kani
2016-05-10 16:23   ` Toshi Kani
2016-05-10 16:23   ` Toshi Kani
2016-05-10 16:23 ` [PATCH v4 4/6] ext2: " Toshi Kani
2016-05-10 16:23   ` Toshi Kani
2016-05-10 16:23   ` Toshi Kani
2016-05-10 16:23 ` [PATCH v4 5/6] xfs: " Toshi Kani
2016-05-10 16:23   ` Toshi Kani
2016-05-10 16:23   ` Toshi Kani
2016-05-10 16:23 ` [PATCH v4 6/6] block: Update blkdev_dax_capable() for consistency Toshi Kani
2016-05-10 16:23   ` Toshi Kani
2016-05-10 16:23   ` Toshi Kani
2016-05-10 19:49   ` Dan Williams
2016-05-10 19:49     ` Dan Williams
2016-05-10 19:49     ` Dan Williams
2016-05-10 21:36     ` Toshi Kani
2016-05-10 21:36       ` Toshi Kani
2016-05-10 21:36       ` Toshi Kani
2016-05-11  8:05   ` Jan Kara
2016-05-11  8:05     ` Jan Kara
2016-05-11  8:05     ` Jan Kara
2016-05-11 14:25     ` Toshi Kani
2016-05-11 14:25       ` Toshi Kani
2016-05-11 14:25       ` Toshi Kani
2016-05-11 15:26       ` Jan Kara
2016-05-11 15:26         ` Jan Kara
2016-05-11 15:26         ` Jan Kara
2016-05-17 22:07   ` Dan Williams
2016-05-17 22:07     ` Dan Williams
2016-05-17 22:07     ` Dan Williams
2016-05-17 23:02     ` Toshi Kani
2016-05-18  7:54   ` Arnd Bergmann [this message]
2016-05-18  7:54     ` [PATCH] remove unused blkdev_dax_capable() function Arnd Bergmann
2016-05-18 14:01     ` Toshi Kani
2016-05-18 14:01       ` Toshi Kani
2016-05-18 14:01       ` Toshi Kani
2016-05-18 19:30     ` Vishal Verma
2016-05-18 19:30       ` Vishal Verma
2016-05-18 19:30       ` Vishal Verma
2016-05-20 11:32     ` kbuild test robot
2016-05-20 11:32       ` kbuild test robot
2016-05-20 11:32       ` kbuild test robot
2016-05-20 15:48       ` Kani, Toshimitsu
2016-05-20 15:48         ` Kani, Toshimitsu
2016-05-20 15:48         ` Kani, Toshimitsu
2016-05-20 15:48         ` Kani, Toshimitsu
2016-05-11 13:20 ` [PATCH v4 0/6] Add alignment check for DAX mount Carlos Maiolino
2016-05-19 23:37 ` Eric Sandeen
2016-05-19 23:37   ` Eric Sandeen
2016-05-19 23:37   ` Eric Sandeen
2016-05-20 14:50   ` Kani, Toshimitsu
2016-05-20 14:50     ` Kani, Toshimitsu
2016-05-20 14:50     ` Kani, Toshimitsu
2016-05-20 14:50     ` Kani, Toshimitsu
2016-05-20 17:34     ` Verma, Vishal L
2016-05-20 17:34       ` Verma, Vishal L
2016-05-20 17:34       ` Verma, Vishal L
2016-05-20 17:34       ` Verma, Vishal L
2016-05-20 17:49       ` Kani, Toshimitsu
2016-05-20 17:49         ` Kani, Toshimitsu
2016-05-20 17:49         ` Kani, Toshimitsu
2016-05-20 17:49         ` Kani, Toshimitsu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3280835.MNk2ItMooy@wuerfel \
    --to=arnd@arndb.de \
    --cc=adilger.kernel@dilger.ca \
    --cc=axboe@fb.com \
    --cc=boaz@plexistor.com \
    --cc=dan.j.williams@intel.com \
    --cc=david@fromorbit.com \
    --cc=hch@infradead.org \
    --cc=jack@suse.cz \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvdimm@lists.01.org \
    --cc=micah.parrish@hpe.com \
    --cc=ross.zwisler@linux.intel.com \
    --cc=toshi.kani@hpe.com \
    --cc=tytso@mit.edu \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.