X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fblkdev_compat.h;h=d2e80ec88f6123283255ba4f0c80a561474386b7;hb=45066d1f20a582fc8229776503b1cdd554d7fde4;hp=f841c6c00c51dcae32ab0ef2bb40db304834c644;hpb=61e909608d15dc6900a710a0ceab6e101a68ac5a;p=zfs.git

diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h
index f841c6c..d2e80ec 100644
--- a/include/linux/blkdev_compat.h
+++ b/include/linux/blkdev_compat.h
@@ -280,16 +280,31 @@ bio_set_flags_failfast(struct block_device *bdev, int *flags)
 #endif /* HAVE_2ARGS_BIO_END_IO_T */
 
 /*
- * 2.6.28 API change
+ * 2.6.38 - 2.6.x API,
+ *   blkdev_get_by_path()
+ *   blkdev_put()
+ *
+ * 2.6.28 - 2.6.37 API,
+ *   open_bdev_exclusive()
+ *   close_bdev_exclusive()
+ *
+ * 2.6.12 - 2.6.27 API,
+ *   open_bdev_excl()
+ *   close_bdev_excl()
+ *
  * Used to exclusively open a block device from within the kernel.
  */
-#ifdef HAVE_OPEN_BDEV_EXCLUSIVE
+#if defined(HAVE_BLKDEV_GET_BY_PATH)
+# define vdev_bdev_open(path, md, hld)	blkdev_get_by_path(path, \
+					    (md) | FMODE_EXCL, hld)
+# define vdev_bdev_close(bdev, md)	blkdev_put(bdev, (md) | FMODE_EXCL)
+#elif defined(HAVE_OPEN_BDEV_EXCLUSIVE)
 # define vdev_bdev_open(path, md, hld)	open_bdev_exclusive(path, md, hld)
 # define vdev_bdev_close(bdev, md)	close_bdev_exclusive(bdev, md)
 #else
 # define vdev_bdev_open(path, md, hld)	open_bdev_excl(path, md, hld)
 # define vdev_bdev_close(bdev, md)	close_bdev_excl(bdev)
-#endif /* HAVE_OPEN_BDEV_EXCLUSIVE */
+#endif /* HAVE_BLKDEV_GET_BY_PATH | HAVE_OPEN_BDEV_EXCLUSIVE */
 
 /*
  * 2.6.22 API change