Commit ee87cf5e authored Aug 01, 2017 by Anand Jain Committed by David Sterba Oct 30, 2017

btrfs: copy fsid to super_block s_uuid



We didn't copy fsid to struct super_block.s_uuid so Overlay disables
index feature with btrfs as the lower FS.

kernel: overlayfs: fs on '/lower' does not support file handles, falling back to index=off.

Fix this by publishing the fsid through struct super_block.s_uuid.

[ dsterba: I think that setting s_uuid is the last missing bit. Overlay
  needs the file handle encoding support from the lower filesystem, which
  is supported. Filling the whole filesystem id is correct, the subvolume
  id is encoded in the file handle buffer from inside btrfs_encode_fh. ]

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 718dc5fa

fs/btrfs/disk-io.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2901,6 +2901,7 @@ int open_ctree(struct super_block *sb,

		sb->s_blocksize = sectorsize;
		sb->s_blocksize_bits = blksize_bits(sectorsize);
		memcpy(&sb->s_uuid, fs_info->fsid, BTRFS_FSID_SIZE);

		mutex_lock(&fs_info->chunk_mutex);
		ret = btrfs_read_sys_array(fs_info);

Admin message