summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2024-01-16 22:45:53 -0500
committerKent Overstreet <kent.overstreet@linux.dev>2024-01-24 17:36:11 -0500
commit38b8d01c4cf823d9804451eff5ec811c17b03408 (patch)
tree4ae8f519d79df5a7f8744ef217953f24c9d5ba09 /include
parent7717a439cffdd32808131ee9837e6c8a8a1972fc (diff)
Update bcachefs sources to 481b5f343248 bcachefs: Better error messages for missing inodes in fsck
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'include')
-rw-r--r--include/linux/blkdev.h13
-rw-r--r--include/linux/poison.h2
2 files changed, 11 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 39143117..998f5e2c 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -89,10 +89,15 @@ struct blk_holder_ops {
void (*mark_dead)(struct block_device *bdev);
};
-void blkdev_put(struct block_device *bdev, void *holder);
-void bdput(struct block_device *bdev);
-struct block_device *blkdev_get_by_path(const char *path, blk_mode_t mode,
- void *holder, const struct blk_holder_ops *hop);
+struct bdev_handle {
+ struct block_device *bdev;
+ void *holder;
+ blk_mode_t mode;
+};
+
+void bdev_release(struct bdev_handle *);
+struct bdev_handle *bdev_open_by_path(const char *, blk_mode_t, void *,
+ const struct blk_holder_ops *);
int lookup_bdev(const char *path, dev_t *);
struct super_block {
diff --git a/include/linux/poison.h b/include/linux/poison.h
index 851a855d..27a7dad1 100644
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -83,6 +83,8 @@
/********** net/core/skbuff.c **********/
#define SKB_LIST_POISON_NEXT ((void *)(0x800 + POISON_POINTER_DELTA))
+/********** net/ **********/
+#define NET_PTR_POISON ((void *)(0x801 + POISON_POINTER_DELTA))
/********** kernel/bpf/ **********/
#define BPF_PTR_POISON ((void *)(0xeB9FUL + POISON_POINTER_DELTA))