Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8d3fe02 authored by Omar Sandoval's avatar Omar Sandoval Committed by Chris Mason
Browse files

Btrfs: show subvol= and subvolid= in /proc/mounts 



Now that we're guaranteed to have a meaningful root dentry, we can just
export seq_dentry() and use it in btrfs_show_options(). The subvolume ID
is easy to get and can also be useful, so put that in there, too.

Reviewed-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarOmar Sandoval <osandov@osandov.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 05dbe683

fs/btrfs/super.c

+4 −0
Original line number Diff line number Diff line
@@ -1188,6 +1188,10 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry) 
		seq_puts(seq, ",fatal_errors=panic");

	if (info->commit_interval != BTRFS_DEFAULT_COMMIT_INTERVAL)

		seq_printf(seq, ",commit=%d", info->commit_interval);

	seq_printf(seq, ",subvolid=%llu",

		  BTRFS_I(d_inode(dentry))->root->root_key.objectid);

	seq_puts(seq, ",subvol=");

	seq_dentry(seq, dentry, " \t\n\\");

	return 0;

}

fs/seq_file.c

+1 −0
Original line number Diff line number Diff line
@@ -538,6 +538,7 @@ int seq_dentry(struct seq_file *m, struct dentry *dentry, const char *esc) 


	return res;

}

EXPORT_SYMBOL(seq_dentry);



static void *single_start(struct seq_file *p, loff_t *pos)

{