Update bcachefs sources to cd779e0cc5 bcachefs: Skip inode unpack/pack in bch2_extent...

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

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index f60972c76b14488770eb1068d9133d04e946edbe..01b3d4adda15f92c9b1484b7057ba2f4b9509278 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;
 
@@ -69,12 +69,22 @@ static inline void submit_bio(struct bio *bio)
        generic_make_request(bio);
 }
 
-int blkdev_issue_discard(struct block_device *, sector_t,
-                        sector_t, gfp_t, unsigned long);
+int blkdev_issue_discard(struct block_device *, sector_t, sector_t, gfp_t);
 
 #define bdev_get_queue(bdev)           (&((bdev)->queue))
 
-#define blk_queue_discard(q)           ((void) (q), 0)
+#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 bdev_max_discard_sectors(bdev) ((void) (bdev), 0)
 #define blk_queue_nonrot(q)            ((void) (q), 0)
 
 unsigned bdev_logical_block_size(struct block_device *bdev);
@@ -105,6 +115,7 @@ struct super_block {
 #define DT_LNK         10
 #define DT_SOCK                12
 #define DT_WHT         14
+#define DT_MAX         16
 #endif
 
 /*