From cb64033c38b028fdfb3a17f296de9f489f6bd905 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Fri, 8 Feb 2008 04:21:37 -0800 Subject: [PATCH] --- yaml --- r: 84788 b: refs/heads/master c: aef97cb9031755422c23cc64f7a089a0fbbcca7a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/autofs4/inode.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ec8949b3e3ee..b54e5fffa8b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 969729d56ef2c8b709844bc0071805f86dfbd2f9 +refs/heads/master: aef97cb9031755422c23cc64f7a089a0fbbcca7a diff --git a/trunk/fs/autofs4/inode.c b/trunk/fs/autofs4/inode.c index 7f05d6ccdb13..2fdcf5e1d236 100644 --- a/trunk/fs/autofs4/inode.c +++ b/trunk/fs/autofs4/inode.c @@ -176,11 +176,16 @@ void autofs4_kill_sb(struct super_block *sb) static int autofs4_show_options(struct seq_file *m, struct vfsmount *mnt) { struct autofs_sb_info *sbi = autofs4_sbi(mnt->mnt_sb); + struct inode *root_inode = mnt->mnt_sb->s_root->d_inode; if (!sbi) return 0; seq_printf(m, ",fd=%d", sbi->pipefd); + if (root_inode->i_uid != 0) + seq_printf(m, ",uid=%u", root_inode->i_uid); + if (root_inode->i_gid != 0) + seq_printf(m, ",gid=%u", root_inode->i_gid); seq_printf(m, ",pgrp=%d", sbi->oz_pgrp); seq_printf(m, ",timeout=%lu", sbi->exp_timeout/HZ); seq_printf(m, ",minproto=%d", sbi->min_proto);