Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 5 insertions, 0 deletions

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 7f05d6ccdb13..2fdcf5e1d236 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -176,11 +176,16 @@ out_kill_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);