* [PATCH] CIFS: Add missed forcemand mount option
@ 2012-03-27 16:51 Pavel Shilovsky
[not found] ` <1332867075-3231-1-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Pavel Shilovsky @ 2012-03-27 16:51 UTC (permalink / raw)
To: linux-cifs-u79uwXL29TY76Z2rM5mHXA
The 'forcemand' form of 'forcemandatorylock' mount option was missed
when the code moved to use the standard token parser. Return it back.
Also fix a comment style in the parser.
Signed-off-by: Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
---
fs/cifs/connect.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 26327ea..7e4775c 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -140,6 +140,7 @@ static const match_table_t cifs_mount_option_tokens = {
{ Opt_nobrl, "nobrl" },
{ Opt_nobrl, "nolock" },
{ Opt_forcemandatorylock, "forcemandatorylock" },
+ { Opt_forcemandatorylock, "forcemand" },
{ Opt_setuids, "setuids" },
{ Opt_nosetuids, "nosetuids" },
{ Opt_dynperm, "dynperm" },
@@ -1397,9 +1398,11 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
break;
case Opt_nobrl:
vol->nobrl = 1;
- /* turn off mandatory locking in mode
+ /*
+ * turn off mandatory locking in mode
* if remote locking is turned off since the
- * local vfs will do advisory */
+ * local vfs will do advisory
+ */
if (vol->file_mode ==
(S_IALLUGO & ~(S_ISUID | S_IXGRP)))
vol->file_mode = S_IALLUGO;
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread[parent not found: <1332867075-3231-1-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>]
* Re: [PATCH] CIFS: Add missed forcemand mount option [not found] ` <1332867075-3231-1-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> @ 2012-03-27 17:07 ` Jeff Layton [not found] ` <20120327130715.39682caa-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> 2012-03-27 18:41 ` Sachin Prabhu 1 sibling, 1 reply; 6+ messages in thread From: Jeff Layton @ 2012-03-27 17:07 UTC (permalink / raw) To: Pavel Shilovsky; +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA On Tue, 27 Mar 2012 20:51:15 +0400 Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> wrote: > The 'forcemand' form of 'forcemandatorylock' mount option was missed > when the code moved to use the standard token parser. Return it back. > > Also fix a comment style in the parser. > > Signed-off-by: Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> > --- > fs/cifs/connect.c | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c > index 26327ea..7e4775c 100644 > --- a/fs/cifs/connect.c > +++ b/fs/cifs/connect.c > @@ -140,6 +140,7 @@ static const match_table_t cifs_mount_option_tokens = { > { Opt_nobrl, "nobrl" }, > { Opt_nobrl, "nolock" }, > { Opt_forcemandatorylock, "forcemandatorylock" }, > + { Opt_forcemandatorylock, "forcemand" }, This looks fine. > { Opt_setuids, "setuids" }, > { Opt_nosetuids, "nosetuids" }, > { Opt_dynperm, "dynperm" }, > @@ -1397,9 +1398,11 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, > break; > case Opt_nobrl: > vol->nobrl = 1; > - /* turn off mandatory locking in mode > + /* > + * turn off mandatory locking in mode > * if remote locking is turned off since the > - * local vfs will do advisory */ > + * local vfs will do advisory > + */ This doesn't look like it's related but just a comment cleanup? > if (vol->file_mode == > (S_IALLUGO & ~(S_ISUID | S_IXGRP))) > vol->file_mode = S_IALLUGO; Either way... Reviewed-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20120327130715.39682caa-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>]
* Re: [PATCH] CIFS: Add missed forcemand mount option [not found] ` <20120327130715.39682caa-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> @ 2012-03-27 17:17 ` Pavel Shilovsky [not found] ` <CAKywueT3Hoce-HrR14KamF2rhW4rjb-8PodejLEABNdmVZAhfA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Pavel Shilovsky @ 2012-03-27 17:17 UTC (permalink / raw) To: Jeff Layton; +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA 27 марта 2012 г. 21:07 пользователь Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> написал: > On Tue, 27 Mar 2012 20:51:15 +0400 > Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> wrote: > >> The 'forcemand' form of 'forcemandatorylock' mount option was missed >> when the code moved to use the standard token parser. Return it back. >> >> Also fix a comment style in the parser. >> >> Signed-off-by: Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> >> --- >> fs/cifs/connect.c | 7 +++++-- >> 1 files changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c >> index 26327ea..7e4775c 100644 >> --- a/fs/cifs/connect.c >> +++ b/fs/cifs/connect.c >> @@ -140,6 +140,7 @@ static const match_table_t cifs_mount_option_tokens = { >> { Opt_nobrl, "nobrl" }, >> { Opt_nobrl, "nolock" }, >> { Opt_forcemandatorylock, "forcemandatorylock" }, >> + { Opt_forcemandatorylock, "forcemand" }, > > This looks fine. > >> { Opt_setuids, "setuids" }, >> { Opt_nosetuids, "nosetuids" }, >> { Opt_dynperm, "dynperm" }, >> @@ -1397,9 +1398,11 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, >> break; >> case Opt_nobrl: >> vol->nobrl = 1; >> - /* turn off mandatory locking in mode >> + /* >> + * turn off mandatory locking in mode >> * if remote locking is turned off since the >> - * local vfs will do advisory */ >> + * local vfs will do advisory >> + */ > > This doesn't look like it's related but just a comment cleanup? Yes - just a cleanup! > >> if (vol->file_mode == >> (S_IALLUGO & ~(S_ISUID | S_IXGRP))) >> vol->file_mode = S_IALLUGO; > > Either way... > > Reviewed-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> -- Best regards, Pavel Shilovsky. ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <CAKywueT3Hoce-HrR14KamF2rhW4rjb-8PodejLEABNdmVZAhfA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH] CIFS: Add missed forcemand mount option [not found] ` <CAKywueT3Hoce-HrR14KamF2rhW4rjb-8PodejLEABNdmVZAhfA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2012-03-27 18:20 ` Pavel Shilovsky [not found] ` <CAKywueTvjM4UMsF9WG40cbM6mbbsbLg0j0OG304PdHnBPkehXg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Pavel Shilovsky @ 2012-03-27 18:20 UTC (permalink / raw) To: Jeff Layton; +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA 27 марта 2012 г. 21:17 пользователь Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> написал: > 27 марта 2012 г. 21:07 пользователь Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> написал: >> On Tue, 27 Mar 2012 20:51:15 +0400 >> Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> wrote: >> >>> The 'forcemand' form of 'forcemandatorylock' mount option was missed >>> when the code moved to use the standard token parser. Return it back. >>> >>> Also fix a comment style in the parser. >>> >>> Signed-off-by: Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> >>> --- >>> fs/cifs/connect.c | 7 +++++-- >>> 1 files changed, 5 insertions(+), 2 deletions(-) >>> >>> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c >>> index 26327ea..7e4775c 100644 >>> --- a/fs/cifs/connect.c >>> +++ b/fs/cifs/connect.c >>> @@ -140,6 +140,7 @@ static const match_table_t cifs_mount_option_tokens = { >>> { Opt_nobrl, "nobrl" }, >>> { Opt_nobrl, "nolock" }, >>> { Opt_forcemandatorylock, "forcemandatorylock" }, >>> + { Opt_forcemandatorylock, "forcemand" }, >> >> This looks fine. >> >>> { Opt_setuids, "setuids" }, >>> { Opt_nosetuids, "nosetuids" }, >>> { Opt_dynperm, "dynperm" }, >>> @@ -1397,9 +1398,11 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, >>> break; >>> case Opt_nobrl: >>> vol->nobrl = 1; >>> - /* turn off mandatory locking in mode >>> + /* >>> + * turn off mandatory locking in mode >>> * if remote locking is turned off since the >>> - * local vfs will do advisory */ >>> + * local vfs will do advisory >>> + */ >> >> This doesn't look like it's related but just a comment cleanup? > > Yes - just a cleanup! > seems like I needed to exclude this out of the patch and respin but it has been already merged into master. -- Best regards, Pavel Shilovsky. ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <CAKywueTvjM4UMsF9WG40cbM6mbbsbLg0j0OG304PdHnBPkehXg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH] CIFS: Add missed forcemand mount option [not found] ` <CAKywueTvjM4UMsF9WG40cbM6mbbsbLg0j0OG304PdHnBPkehXg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2012-03-27 18:24 ` Jeff Layton 0 siblings, 0 replies; 6+ messages in thread From: Jeff Layton @ 2012-03-27 18:24 UTC (permalink / raw) To: Pavel Shilovsky; +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA On Tue, 27 Mar 2012 22:20:24 +0400 Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> wrote: > 27 марта 2012 г. 21:17 пользователь Pavel Shilovsky > <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> написал: > > 27 марта 2012 г. 21:07 пользователь Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> написал: > >> On Tue, 27 Mar 2012 20:51:15 +0400 > >> Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> wrote: > >> > >>> The 'forcemand' form of 'forcemandatorylock' mount option was missed > >>> when the code moved to use the standard token parser. Return it back. > >>> > >>> Also fix a comment style in the parser. > >>> > >>> Signed-off-by: Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> > >>> --- > >>> fs/cifs/connect.c | 7 +++++-- > >>> 1 files changed, 5 insertions(+), 2 deletions(-) > >>> > >>> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c > >>> index 26327ea..7e4775c 100644 > >>> --- a/fs/cifs/connect.c > >>> +++ b/fs/cifs/connect.c > >>> @@ -140,6 +140,7 @@ static const match_table_t cifs_mount_option_tokens = { > >>> { Opt_nobrl, "nobrl" }, > >>> { Opt_nobrl, "nolock" }, > >>> { Opt_forcemandatorylock, "forcemandatorylock" }, > >>> + { Opt_forcemandatorylock, "forcemand" }, > >> > >> This looks fine. > >> > >>> { Opt_setuids, "setuids" }, > >>> { Opt_nosetuids, "nosetuids" }, > >>> { Opt_dynperm, "dynperm" }, > >>> @@ -1397,9 +1398,11 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, > >>> break; > >>> case Opt_nobrl: > >>> vol->nobrl = 1; > >>> - /* turn off mandatory locking in mode > >>> + /* > >>> + * turn off mandatory locking in mode > >>> * if remote locking is turned off since the > >>> - * local vfs will do advisory */ > >>> + * local vfs will do advisory > >>> + */ > >> > >> This doesn't look like it's related but just a comment cleanup? > > > > Yes - just a cleanup! > > > > seems like I needed to exclude this out of the patch and respin but it > has been already merged into master. > That's fine -- not a big deal... -- Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] CIFS: Add missed forcemand mount option [not found] ` <1332867075-3231-1-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> 2012-03-27 17:07 ` Jeff Layton @ 2012-03-27 18:41 ` Sachin Prabhu 1 sibling, 0 replies; 6+ messages in thread From: Sachin Prabhu @ 2012-03-27 18:41 UTC (permalink / raw) To: Pavel Shilovsky; +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA On Tue, 2012-03-27 at 20:51 +0400, Pavel Shilovsky wrote: > The 'forcemand' form of 'forcemandatorylock' mount option was missed > when the code moved to use the standard token parser. Return it back. > > Also fix a comment style in the parser. > > Signed-off-by: Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org> > --- > fs/cifs/connect.c | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c > index 26327ea..7e4775c 100644 > --- a/fs/cifs/connect.c > +++ b/fs/cifs/connect.c > @@ -140,6 +140,7 @@ static const match_table_t cifs_mount_option_tokens = { > { Opt_nobrl, "nobrl" }, > { Opt_nobrl, "nolock" }, > { Opt_forcemandatorylock, "forcemandatorylock" }, > + { Opt_forcemandatorylock, "forcemand" }, > { Opt_setuids, "setuids" }, > { Opt_nosetuids, "nosetuids" }, > { Opt_dynperm, "dynperm" }, > @@ -1397,9 +1398,11 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, > break; > case Opt_nobrl: > vol->nobrl = 1; > - /* turn off mandatory locking in mode > + /* > + * turn off mandatory locking in mode > * if remote locking is turned off since the > - * local vfs will do advisory */ > + * local vfs will do advisory > + */ > if (vol->file_mode == > (S_IALLUGO & ~(S_ISUID | S_IXGRP))) > vol->file_mode = S_IALLUGO; Looks fine. Reviewed-By: Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-03-27 18:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-27 16:51 [PATCH] CIFS: Add missed forcemand mount option Pavel Shilovsky
[not found] ` <1332867075-3231-1-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
2012-03-27 17:07 ` Jeff Layton
[not found] ` <20120327130715.39682caa-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2012-03-27 17:17 ` Pavel Shilovsky
[not found] ` <CAKywueT3Hoce-HrR14KamF2rhW4rjb-8PodejLEABNdmVZAhfA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-03-27 18:20 ` Pavel Shilovsky
[not found] ` <CAKywueTvjM4UMsF9WG40cbM6mbbsbLg0j0OG304PdHnBPkehXg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-03-27 18:24 ` Jeff Layton
2012-03-27 18:41 ` Sachin Prabhu
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.