From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Hansen Subject: [RFC][PATCH 26/27] /proc/mounts: treat ro/rw like the rest Date: Wed, 07 Jun 2006 17:10:39 -0700 Message-ID: <20060608001039.CC972E9B@localhost.localdomain> References: <20060608001013.0D041507@localhost.localdomain> Cc: herbert@13thfloor.at, viro@ftp.linux.org.uk, hch@infradead.org, trond.myklebust@fys.uio.no, Dave Hansen Return-path: Received: from e35.co.us.ibm.com ([32.97.110.153]:3548 "EHLO e35.co.us.ibm.com") by vger.kernel.org with ESMTP id S932478AbWFHAKo (ORCPT ); Wed, 7 Jun 2006 20:10:44 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e35.co.us.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id k580AhFa017071 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Jun 2006 20:10:43 -0400 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.6/NCO/VER7.0) with ESMTP id k580Ahdg295402 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 7 Jun 2006 18:10:43 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id k580AgSN009171 for ; Wed, 7 Jun 2006 18:10:43 -0600 To: linux-fsdevel@vger.kernel.org In-Reply-To: <20060608001013.0D041507@localhost.localdomain> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Originally from: Herbert Poetzl Now that we have the set/unset fields in the fs_info[] array, we can stop special-casing the ro/rw bits. Signed-off-by: Dave Hansen --- lxc-dave/fs/namespace.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) diff -puN fs/namespace.c~D7-proc-show-ro-attr-actual fs/namespace.c --- lxc/fs/namespace.c~D7-proc-show-ro-attr-actual 2006-06-07 16:53:28.000000000 -0700 +++ lxc-dave/fs/namespace.c 2006-06-07 16:53:28.000000000 -0700 @@ -361,6 +361,7 @@ static int show_vfsmnt(struct seq_file * char *set_str; char *unset_str; } fs_info[] = { + { MS_RDONLY, MNT_RDONLY, "ro", "rw" }, { MS_SYNCHRONOUS, 0, ",sync", NULL }, { MS_DIRSYNC, 0, ",dirsync", NULL }, { MS_MANDLOCK, 0, ",mand", NULL }, @@ -376,7 +377,7 @@ static int show_vfsmnt(struct seq_file * seq_path(m, mnt, mnt->mnt_root, " \t\n\\"); seq_putc(m, ' '); mangle(m, mnt->mnt_sb->s_type->name); - seq_puts(m, mnt->mnt_sb->s_flags & MS_RDONLY ? " ro" : " rw"); + seq_putc(m, ' '); for (i = 0; i < ARRAY_SIZE(fs_info); i++) { struct proc_fs_info *fs_infop = &fs_info[i]; char *str = NULL; _