Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block fix from Jens Axboe:
 "A single fix that should go into 4.10, fixing a regression on some
  devices with the WRITE_SAME command"

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: don't try Write Same from __blkdev_issue_zeroout

1 files changed, 1 insertions, 1 deletions

diff --git a/ring.h b/ring.h
index 823e49a..e9f1b18 100644
--- a/ring.h
+++ b/ring.h
@@ -79,7 +79,7 @@ static inline void next_rnd_slot(unsigned int *it, struct ring *ring)
 	*it = rand() % ring->layout.tp_frame_nr;
 }
 
-static inline size_t ring_size(char *ifname, size_t size)
+static inline size_t ring_size(const char *ifname, size_t size)
 {
 	if (size > 0)
 		return size;