Re: [patch 19/26] mount options: fix jfs
On Thu, 2008-01-24 at 13:57 -0800, Andrew Morton wrote: > My usual algorithm here is to > > 1: queue all the patches and send the ones which have a maintainer to >that maintainer until he merges it. > > 2: If the patches have a dependency upon (say) a VFS patch then I'll >merge the VFS patch and will then goto 1. > > I don't think this particular patch has a VFS depencency so sure, merge > away. You'll probably see that I merged it anyway, but I'll drop it again > when I see it turn up in your tree (I used to resync with the git trees > at least daily, but I now do this far less frequently because it is such > torture because everyone is paddling in everyone else's puddle). Merged. Thanks. Shaggy -- David Kleikamp IBM Linux Technology Center - To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 19/26] mount options: fix jfs
> On Thu, 24 Jan 2008 15:15:01 -0600 Dave Kleikamp <[EMAIL PROTECTED]> wrote: > On Thu, 2008-01-24 at 20:34 +0100, Miklos Szeredi wrote: > > plain text document attachment (jfs_opts.patch) > > From: Miklos Szeredi <[EMAIL PROTECTED]> > > > > Add iocharset= and errors= options to /proc/mounts for jfs > > filesystems. > > > > Signed-off-by: Miklos Szeredi <[EMAIL PROTECTED]> > > Acked-by: Dave Kleikamp <[EMAIL PROTECTED]> > > Andrew, > Would you like me to add this to the jfs git tree, or would you like to > handle these patches as a set? > My usual algorithm here is to 1: queue all the patches and send the ones which have a maintainer to that maintainer until he merges it. 2: If the patches have a dependency upon (say) a VFS patch then I'll merge the VFS patch and will then goto 1. I don't think this particular patch has a VFS depencency so sure, merge away. You'll probably see that I merged it anyway, but I'll drop it again when I see it turn up in your tree (I used to resync with the git trees at least daily, but I now do this far less frequently because it is such torture because everyone is paddling in everyone else's puddle). - To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 19/26] mount options: fix jfs
On Thu, 2008-01-24 at 20:34 +0100, Miklos Szeredi wrote: > plain text document attachment (jfs_opts.patch) > From: Miklos Szeredi <[EMAIL PROTECTED]> > > Add iocharset= and errors= options to /proc/mounts for jfs > filesystems. > > Signed-off-by: Miklos Szeredi <[EMAIL PROTECTED]> Acked-by: Dave Kleikamp <[EMAIL PROTECTED]> Andrew, Would you like me to add this to the jfs git tree, or would you like to handle these patches as a set? Thanks, Shaggy > --- > > Index: linux/fs/jfs/super.c > === > --- linux.orig/fs/jfs/super.c 2008-01-17 19:00:55.0 +0100 > +++ linux/fs/jfs/super.c 2008-01-21 19:39:30.0 +0100 > @@ -602,6 +602,12 @@ static int jfs_show_options(struct seq_f > seq_printf(seq, ",umask=%03o", sbi->umask); > if (sbi->flag & JFS_NOINTEGRITY) > seq_puts(seq, ",nointegrity"); > + if (sbi->nls_tab) > + seq_printf(seq, ",iocharset=%s", sbi->nls_tab->charset); > + if (sbi->flag & JFS_ERR_CONTINUE) > + seq_printf(seq, ",errors=continue"); > + if (sbi->flag & JFS_ERR_PANIC) > + seq_printf(seq, ",errors=panic"); > > #ifdef CONFIG_QUOTA > if (sbi->flag & JFS_USRQUOTA) > > -- -- David Kleikamp IBM Linux Technology Center - To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[patch 19/26] mount options: fix jfs
From: Miklos Szeredi <[EMAIL PROTECTED]> Add iocharset= and errors= options to /proc/mounts for jfs filesystems. Signed-off-by: Miklos Szeredi <[EMAIL PROTECTED]> --- Index: linux/fs/jfs/super.c === --- linux.orig/fs/jfs/super.c 2008-01-17 19:00:55.0 +0100 +++ linux/fs/jfs/super.c2008-01-21 19:39:30.0 +0100 @@ -602,6 +602,12 @@ static int jfs_show_options(struct seq_f seq_printf(seq, ",umask=%03o", sbi->umask); if (sbi->flag & JFS_NOINTEGRITY) seq_puts(seq, ",nointegrity"); + if (sbi->nls_tab) + seq_printf(seq, ",iocharset=%s", sbi->nls_tab->charset); + if (sbi->flag & JFS_ERR_CONTINUE) + seq_printf(seq, ",errors=continue"); + if (sbi->flag & JFS_ERR_PANIC) + seq_printf(seq, ",errors=panic"); #ifdef CONFIG_QUOTA if (sbi->flag & JFS_USRQUOTA) -- - To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
