Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751921AbdGERLD (ORCPT ); Wed, 5 Jul 2017 13:11:03 -0400 Received: from mail-it0-f52.google.com ([209.85.214.52]:34169 "EHLO mail-it0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751659AbdGERLB (ORCPT ); Wed, 5 Jul 2017 13:11:01 -0400 MIME-Version: 1.0 In-Reply-To: <149926827485.20611.645141023456687456.stgit@warthog.procyon.org.uk> References: <149926824154.20611.6104595541055328700.stgit@warthog.procyon.org.uk> <149926827485.20611.645141023456687456.stgit@warthog.procyon.org.uk> From: Kees Cook Date: Wed, 5 Jul 2017 10:10:59 -0700 X-Google-Sender-Auth: _vB_ABOePsaVDH1kuW7OeroGCMQ Message-ID: Subject: Re: [PATCH 04/14] pstore: Implement show_options To: David Howells Cc: Al Viro , Tony Luck , Anton Vorontsov , LKML , Colin Cross , "linux-fsdevel@vger.kernel.org" Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3047 Lines: 99 On Wed, Jul 5, 2017 at 8:24 AM, David Howells wrote: > Implement the show_options superblock op for pstore as part of a bid to get > rid of s_options and generic_show_options() to make it easier to implement > a context-based mount where the mount options can be passed individually > over a file descriptor. > > Signed-off-by: David Howells > cc: Kees Cook > cc: Anton Vorontsov > cc: Colin Cross > cc: Tony Luck Acked-by: Kees Cook Do you want me to take this into the pstore tree or do you want to push it via a separate tree? -Kees > --- > > fs/pstore/inode.c | 14 +++++++++++--- > fs/pstore/internal.h | 3 +++ > fs/pstore/platform.c | 2 +- > 3 files changed, 15 insertions(+), 4 deletions(-) > > diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c > index 792a4e5f9226..913e839ac1f5 100644 > --- a/fs/pstore/inode.c > +++ b/fs/pstore/inode.c > @@ -283,6 +283,16 @@ static void parse_options(char *options) > } > } > > +/* > + * Display the mount options in /proc/mounts. > + */ > +static int pstore_show_options(struct seq_file *m, struct dentry *root) > +{ > + if (kmsg_bytes != PSTORE_DEFAULT_KMSG_BYTES) > + seq_printf(m, ",kmsg_bytes=%lu", kmsg_bytes); > + return 0; > +} > + > static int pstore_remount(struct super_block *sb, int *flags, char *data) > { > sync_filesystem(sb); > @@ -296,7 +306,7 @@ static const struct super_operations pstore_ops = { > .drop_inode = generic_delete_inode, > .evict_inode = pstore_evict_inode, > .remount_fs = pstore_remount, > - .show_options = generic_show_options, > + .show_options = pstore_show_options, > }; > > static struct super_block *pstore_sb; > @@ -448,8 +458,6 @@ static int pstore_fill_super(struct super_block *sb, void *data, int silent) > { > struct inode *inode; > > - save_mount_options(sb, data); > - > pstore_sb = sb; > > sb->s_maxbytes = MAX_LFS_FILESIZE; > diff --git a/fs/pstore/internal.h b/fs/pstore/internal.h > index c416e653dc4f..4d5913130580 100644 > --- a/fs/pstore/internal.h > +++ b/fs/pstore/internal.h > @@ -5,6 +5,9 @@ > #include > #include > > +#define PSTORE_DEFAULT_KMSG_BYTES 10240 > +extern unsigned long kmsg_bytes; > + > #ifdef CONFIG_PSTORE_FTRACE > extern void pstore_register_ftrace(void); > extern void pstore_unregister_ftrace(void); > diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c > index d468eec9b8a6..6640df40908d 100644 > --- a/fs/pstore/platform.c > +++ b/fs/pstore/platform.c > @@ -99,7 +99,7 @@ static char *big_oops_buf; > static size_t big_oops_buf_sz; > > /* How much of the console log to snapshot */ > -static unsigned long kmsg_bytes = 10240; > +unsigned long kmsg_bytes = PSTORE_DEFAULT_KMSG_BYTES; > > void pstore_set_kmsg_bytes(int bytes) > { > -- Kees Cook Pixel Security