New upstream snapshot

[bcachefs-tools-debian] / include / linux / blkdev.h

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 35082ae30460911d26fc11bb1f052724c1d62378..4ce43b5cc629b6e4150b12eb7b61f3f281834816 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -6,7 +6,7 @@
 #include <linux/kobject.h>
 #include <linux/types.h>
 
-#define BIO_MAX_VECS   256
+#define BIO_MAX_VECS   256U
 
 typedef unsigned fmode_t;
 
@@ -74,6 +74,17 @@ int blkdev_issue_discard(struct block_device *, sector_t,
 
 #define bdev_get_queue(bdev)           (&((bdev)->queue))
 
+#ifndef SECTOR_SHIFT
+#define SECTOR_SHIFT 9
+#endif
+#ifndef SECTOR_SIZE
+#define SECTOR_SIZE (1 << SECTOR_SHIFT)
+#endif
+
+#define PAGE_SECTORS_SHIFT     (PAGE_SHIFT - SECTOR_SHIFT)
+#define PAGE_SECTORS           (1 << PAGE_SECTORS_SHIFT)
+#define SECTOR_MASK            (PAGE_SECTORS - 1)
+
 #define blk_queue_discard(q)           ((void) (q), 0)
 #define blk_queue_nonrot(q)            ((void) (q), 0)