From: Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: Pavel Shilovsky <piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH] CIFS: Add missed forcemand mount option
Date: Tue, 27 Mar 2012 19:41:39 +0100 [thread overview]
Message-ID: <1332873699.17485.0.camel@localhost> (raw)
In-Reply-To: <1332867075-3231-1-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
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>
prev parent reply other threads:[~2012-03-27 18:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332873699.17485.0.camel@localhost \
--to=sprabhu-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
--cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox