diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 2 | ||||
| -rw-r--r-- | include/linux/xattr.h | 4 | ||||
| -rw-r--r-- | include/trace/events/bcachefs.h | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 4300c4da..f60972c7 100644 --- 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_PAGES 256 +#define BIO_MAX_VECS 256 typedef unsigned fmode_t; diff --git a/include/linux/xattr.h b/include/linux/xattr.h index fbc1e1f5..222c72fe 100644 --- a/include/linux/xattr.h +++ b/include/linux/xattr.h @@ -26,6 +26,7 @@ struct inode; struct dentry; +struct user_namespace; /* * struct xattr_handler: When @name is set, match attributes with exactly that @@ -40,7 +41,8 @@ struct xattr_handler { int (*get)(const struct xattr_handler *, struct dentry *dentry, struct inode *inode, const char *name, void *buffer, size_t size); - int (*set)(const struct xattr_handler *, struct dentry *dentry, + int (*set)(const struct xattr_handler *, + struct user_namespace *mnt_userns, struct dentry *dentry, struct inode *inode, const char *name, const void *buffer, size_t size, int flags); }; diff --git a/include/trace/events/bcachefs.h b/include/trace/events/bcachefs.h index b5fcda9e..4c0d9b76 100644 --- a/include/trace/events/bcachefs.h +++ b/include/trace/events/bcachefs.h @@ -71,10 +71,10 @@ DECLARE_EVENT_CLASS(bio, ), TP_fast_assign( - __entry->dev = bio->bi_disk ? bio_dev(bio) : 0; + __entry->dev = bio->bi_bdev ? bio_dev(bio) : 0; __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio->bi_iter.bi_size >> 9; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); ), TP_printk("%d,%d %s %llu + %u", |