From: Pavel Shilovsky <piastry@etersoft.ru>
To: linux-kernel@vger.kernel.org
Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-nfs@vger.kernel.org, wine-devel@winehq.org
Subject: [PATCH v3 6/7] NFSv4: Add O_DENY* open flags support
Date: Thu, 28 Feb 2013 19:25:32 +0400 [thread overview]
Message-ID: <1362065133-9490-7-git-send-email-piastry@etersoft.ru> (raw)
In-Reply-To: <1362065133-9490-1-git-send-email-piastry@etersoft.ru>
by passing these flags to NFSv4 open request.
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
---
fs/nfs/nfs4xdr.c | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 26b1439..58ddc74 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1325,7 +1325,8 @@ static void encode_lookup(struct xdr_stream *xdr, const struct qstr *name, struc
encode_string(xdr, name->len, name->name);
}
-static void encode_share_access(struct xdr_stream *xdr, fmode_t fmode)
+static void encode_share_access(struct xdr_stream *xdr, fmode_t fmode,
+ int open_flags)
{
__be32 *p;
@@ -1343,7 +1344,22 @@ static void encode_share_access(struct xdr_stream *xdr, fmode_t fmode)
default:
*p++ = cpu_to_be32(0);
}
- *p = cpu_to_be32(0); /* for linux, share_deny = 0 always */
+ if (open_flags & O_DENYMAND) {
+ switch (open_flags & (O_DENYREAD|O_DENYWRITE)) {
+ case O_DENYREAD:
+ *p = cpu_to_be32(NFS4_SHARE_DENY_READ);
+ break;
+ case O_DENYWRITE:
+ *p = cpu_to_be32(NFS4_SHARE_DENY_WRITE);
+ break;
+ case O_DENYREAD|O_DENYWRITE:
+ *p = cpu_to_be32(NFS4_SHARE_DENY_BOTH);
+ break;
+ default:
+ *p = cpu_to_be32(0);
+ }
+ } else
+ *p = cpu_to_be32(0);
}
static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_openargs *arg)
@@ -1354,7 +1370,7 @@ static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_opena
* owner 4 = 32
*/
encode_nfs4_seqid(xdr, arg->seqid);
- encode_share_access(xdr, arg->fmode);
+ encode_share_access(xdr, arg->fmode, arg->open_flags);
p = reserve_space(xdr, 36);
p = xdr_encode_hyper(p, arg->clientid);
*p++ = cpu_to_be32(24);
@@ -1491,7 +1507,7 @@ static void encode_open_downgrade(struct xdr_stream *xdr, const struct nfs_close
encode_op_hdr(xdr, OP_OPEN_DOWNGRADE, decode_open_downgrade_maxsz, hdr);
encode_nfs4_stateid(xdr, arg->stateid);
encode_nfs4_seqid(xdr, arg->seqid);
- encode_share_access(xdr, arg->fmode);
+ encode_share_access(xdr, arg->fmode, 0);
}
static void
--
1.8.1.2
next prev parent reply other threads:[~2013-02-28 15:22 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-28 15:25 [PATCH v3 0/7] Add O_DENY* support for VFS and CIFS/NFS Pavel Shilovsky
2013-02-28 15:25 ` [PATCH v3 1/7] fcntl: Introduce new O_DENY* open flags Pavel Shilovsky
2013-02-28 15:25 ` [PATCH v3 5/7] CIFS: Translate SHARING_VIOLATION to -ETXTBSY error code for SMB2 Pavel Shilovsky
[not found] ` <1362065133-9490-6-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
2013-03-11 18:35 ` Jeff Layton
[not found] ` <20130311143507.737f2ab0-4QP7MXygkU+dMjc06nkz3ljfA9RmPOcC@public.gmane.org>
2013-03-11 18:59 ` Pavel Shilovsky
2013-02-28 15:25 ` Pavel Shilovsky [this message]
[not found] ` <1362065133-9490-7-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
2013-03-11 18:54 ` [PATCH v3 6/7] NFSv4: Add O_DENY* open flags support Jeff Layton
[not found] ` <20130311145434.707f5ed1-4QP7MXygkU+dMjc06nkz3ljfA9RmPOcC@public.gmane.org>
2013-03-12 12:35 ` Jeff Layton
[not found] ` <20130312083517.770a17f6-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2013-04-04 10:30 ` Pavel Shilovsky
[not found] ` <CAKywueRSTipeO8V-oNrM=jM8WUo7Dd0ahj_Xcw8f8ViE3NGEOQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-04-04 13:02 ` Jeff Layton
[not found] ` <20130404090232.30457b32-4QP7MXygkU+dMjc06nkz3ljfA9RmPOcC@public.gmane.org>
2013-04-04 17:45 ` Pavel Shilovsky
[not found] ` <1362065133-9490-1-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
2013-02-28 15:25 ` [PATCH v3 2/7] vfs: Add O_DENYREAD/WRITE flags support for open syscall Pavel Shilovsky
[not found] ` <1362065133-9490-3-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
2013-03-11 18:46 ` Jeff Layton
[not found] ` <20130311144609.2ba86964-4QP7MXygkU+dMjc06nkz3ljfA9RmPOcC@public.gmane.org>
2013-03-11 18:57 ` Pavel Shilovsky
[not found] ` <CAKywueTEXOH3s0z2X7e=QugJaQAZ6JPoaYmYPnFLHMOTC7_y4w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-03-11 19:10 ` Jeff Layton
2013-02-28 15:25 ` [PATCH v3 3/7] CIFS: Add O_DENY* open flags support Pavel Shilovsky
[not found] ` <1362065133-9490-4-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
2013-03-11 18:50 ` Jeff Layton
2013-02-28 15:25 ` [PATCH v3 4/7] CIFS: Use NT_CREATE_ANDX command for forcemand mounts Pavel Shilovsky
2013-03-11 18:52 ` Jeff Layton
2013-02-28 15:25 ` [PATCH v3 7/7] NFSD: Pass share reservations flags to VFS Pavel Shilovsky
[not found] ` <1362065133-9490-8-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
2013-03-11 19:05 ` Jeff Layton
[not found] ` <20130311150540.119abd63-4QP7MXygkU+dMjc06nkz3ljfA9RmPOcC@public.gmane.org>
2013-03-11 19:36 ` J. Bruce Fields
[not found] ` <20130311193638.GB642-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2013-03-11 20:08 ` Jeff Layton
[not found] ` <20130311160844.7dedf15a-4QP7MXygkU+dMjc06nkz3ljfA9RmPOcC@public.gmane.org>
2013-03-11 20:11 ` J. Bruce Fields
2013-03-11 20:25 ` Frank S Filz
[not found] ` <OF1D20435B.D7D7B48E-ON87257B2B.006FB8C9-88257B2B.00702F2E-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2013-03-11 20:31 ` J. Bruce Fields
2013-03-11 20:37 ` Frank S Filz
2013-02-28 21:53 ` [PATCH v3 0/7] Add O_DENY* support for VFS and CIFS/NFS Andy Lutomirski
2013-03-01 6:44 ` Pavel Shilovsky
2013-03-01 8:17 ` David Laight
[not found] ` <512FD1D5.3010106-3s7WtUTddSA@public.gmane.org>
2013-03-04 21:19 ` J. Bruce Fields
[not found] ` <20130304211923.GI20389-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2013-03-04 22:49 ` Simo
[not found] ` <5135250A.30604-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
2013-03-05 18:13 ` J. Bruce Fields
[not found] ` <20130305181306.GA15816-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2013-03-05 19:07 ` Simo
[not found] ` <51364285.4040406-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
2013-03-11 13:59 ` Pavel Shilovsky
2013-03-11 18:18 ` Andy Lutomirski
[not found] ` <CALCETrXvyXqx+R2wSROEOb+qrSBpPeCGT_9Z6N+QJOU=1aikPw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-03-11 18:21 ` J. Bruce Fields
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=1362065133-9490-7-git-send-email-piastry@etersoft.ru \
--to=piastry@etersoft.ru \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=wine-devel@winehq.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;
as well as URLs for NNTP newsgroup(s).