On Wed, 2 May 2012 14:25:57 -0400 Jeff Layton <jlayton@xxxxxxxxx> wrote: > We handle this option in userspace, so there's little value in also > passing it to the kernel. > > Also fix minor double-comma nit in the options string. > > Signed-off-by: Jeff Layton <jlayton@xxxxxxxxx> > --- > mount.cifs.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/mount.cifs.c b/mount.cifs.c > index c90ce3e..0408158 100644 > --- a/mount.cifs.c > +++ b/mount.cifs.c > @@ -1023,7 +1023,7 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info) > rc, strerror(rc), value); > return rc; > } > - break; > + goto nocopy; > > case OPT_UID: > if (!value || !*value) > @@ -1834,7 +1834,9 @@ assemble_mountinfo(struct parsed_mount_info *parsed_info, > } > > /* copy in ver= string. It's not really needed, but what the hell */ > - strlcat(parsed_info->options, ",ver=", sizeof(parsed_info->options)); > + if (*parsed_info->options) > + strlcat(parsed_info->options, ",", sizeof(parsed_info->options)); > + strlcat(parsed_info->options, "ver=", sizeof(parsed_info->options)); > strlcat(parsed_info->options, OPTIONS_VERSION, sizeof(parsed_info->options)); > > /* copy in user= string */ Committed... -- Jeff Layton <jlayton@xxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
