diff options
| author | Omar Sandoval <osandov@osandov.com> | 2015-05-18 02:16:31 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-06-03 04:03:02 -0700 |
| commit | c8d3fe028f64054d75c72566efb9ecf3c75ee161 (patch) | |
| tree | 1803c740b33b7b14234235b4f142476d2df9bf10 | |
| parent | 05dbe6837b60465db6a61d1f0cabe745e20aadc9 (diff) | |
| download | op-kernel-dev-c8d3fe028f64054d75c72566efb9ecf3c75ee161.zip op-kernel-dev-c8d3fe028f64054d75c72566efb9ecf3c75ee161.tar.gz | |
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: David Sterba <dsterba@suse.cz>
Signed-off-by: Omar Sandoval <osandov@osandov.com>
Signed-off-by: Chris Mason <clm@fb.com>
| -rw-r--r-- | fs/btrfs/super.c | 4 | ||||
| -rw-r--r-- | fs/seq_file.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 6fa4aaf..cd7ef34 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -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; } diff --git a/fs/seq_file.c b/fs/seq_file.c index 555f821..52b4927 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -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) { |
