linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pavel Shilovsky <piastry@etersoft.ru>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, linux-cifs@vger.kernel.org,
	linux-nfs@vger.kernel.org, wine-devel@winehq.org
Subject: [PATCH v2 7/8] NFSv4: Add O_DENY* open flags support
Date: Thu, 17 Jan 2013 20:53:03 +0400	[thread overview]
Message-ID: <1358441584-8783-7-git-send-email-piastry@etersoft.ru> (raw)
In-Reply-To: <1358441584-8783-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 40836ee..0a0cd1e 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1322,7 +1322,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;
 
@@ -1340,7 +1341,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)
@@ -1351,7 +1367,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);
@@ -1489,7 +1505,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.1

  parent reply	other threads:[~2013-01-17 16:53 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-17 16:52 [PATCH v2 1/8] locks: make flock_lock_file take is_conflict callback parm Pavel Shilovsky
2013-01-17 16:52 ` [PATCH v2 2/8] fcntl: Introduce new O_DENY* open flags Pavel Shilovsky
2013-01-17 16:52 ` [PATCH v2 3/8] vfs: Add O_DENYREAD/WRITE flags support for open syscall Pavel Shilovsky
     [not found]   ` <1358441584-8783-3-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
2013-01-30 22:16     ` J. Bruce Fields
     [not found]       ` <20130130221602.GC15584-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2013-02-05 11:45         ` Pavel Shilovsky
2013-02-05 14:35           ` J. Bruce Fields
2013-02-07  9:53             ` Pavel Shilovsky
     [not found]               ` <CAKywueS6oGNu9r_bypu32A89pOoiGb47kjXqw2ZcZQhZK+JV3g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-02-07 14:18                 ` J. Bruce Fields
     [not found]                   ` <20130207141832.GA3222-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2013-02-07 14:32                     ` Pavel Shilovsky
     [not found]                       ` <CAKywueTmU_L5cwwJSoUY6753eHf_38VtHadZGt9tcLS59sqmOA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-02-07 14:41                         ` J. Bruce Fields
     [not found]                           ` <20130207144156.GB3222-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2013-02-07 16:00                             ` Pavel Shilovsky
     [not found]                               ` <CAKywueShbPd9b+WmJwnfwPR_vzk_atBVRBZNTf-HpS7N2CK+AA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-02-07 16:19                                 ` J. Bruce Fields
     [not found]                                   ` <20130207161948.GG3222-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2013-02-07 16:50                                     ` Pavel Shilovsky
2013-02-07 17:03                                       ` J. Bruce Fields
2013-01-17 16:53 ` [PATCH v2 4/8] CIFS: Add O_DENY* open flags support Pavel Shilovsky
     [not found]   ` <1358441584-8783-4-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
2013-01-30 22:16     ` J. Bruce Fields
     [not found]       ` <20130130221657.GD15584-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2013-02-05 11:54         ` Pavel Shilovsky
2013-01-17 16:53 ` [PATCH v2 5/8] CIFS: Use NT_CREATE_ANDX command for forcemand mounts Pavel Shilovsky
2013-01-17 16:53 ` [PATCH v2 6/8] CIFS: Translate SHARING_VIOLATION to -ETXTBSY error code for SMB2 Pavel Shilovsky
2013-01-17 16:53 ` Pavel Shilovsky [this message]
2013-01-17 16:53 ` [PATCH v2 8/8] NFSD: Pass share reservations flags to VFS Pavel Shilovsky

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=1358441584-8783-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).