path: root/fs/btrfs/volumes.h
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-16 11:43:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-16 11:43:45 -0800
commit713db356041071d16360e82247de3107ec9ed57f (patch)
treeef2d0a469f4da52c39b8d3e296689362e97a9c17 /fs/btrfs/volumes.h
parentMerge tag '5.6-rc1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 (diff)
parentbtrfs: sysfs, move device id directories to UUID/devinfo (diff)
Merge tag 'for-5.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba: "Two races fixed, memory leak fix, sysfs directory fixup and two new log messages: - two fixed race conditions: extent map merging and truncate vs fiemap - create the right sysfs directory with device information and move the individual device dirs under it - print messages when the tree-log is replayed at mount time or cannot be replayed on remount" * tag 'for-5.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: btrfs: sysfs, move device id directories to UUID/devinfo btrfs: sysfs, add UUID/devinfo kobject Btrfs: fix race between shrinking truncate and fiemap btrfs: log message when rw remount is attempted with unclean tree-log btrfs: print message when tree-log replay starts Btrfs: fix race between using extent maps and merging them btrfs: ref-verify: fix memory leaks
Diffstat (limited to 'fs/btrfs/volumes.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 409f4816fb89..f01552a0785e 100644
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -258,6 +258,7 @@ struct btrfs_fs_devices {
/* sysfs kobjects */
struct kobject fsid_kobj;
struct kobject *devices_kobj;
+ struct kobject *devinfo_kobj;
struct completion kobj_unregister;