From patchwork Thu Jan 17 16:53:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 1997141 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 3B3463FE33 for ; Thu, 17 Jan 2013 16:53:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757432Ab3AQQxe (ORCPT ); Thu, 17 Jan 2013 11:53:34 -0500 Received: from mail-la0-f50.google.com ([209.85.215.50]:64413 "EHLO mail-la0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757218Ab3AQQxb (ORCPT ); Thu, 17 Jan 2013 11:53:31 -0500 Received: by mail-la0-f50.google.com with SMTP id er20so1155055lab.23 for ; Thu, 17 Jan 2013 08:53:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=PzSCziPd11MMSM4k0n0X0hz+/W+F9EWNhWDfn9Kpl64=; b=oKOKi8y97vzSHw7dlc8GvQ+BfoKmAx6RH7RKCXtT1pxoaLxdRJso0bIZ1RFrFK8kY4 OJCw7pw4bKl/28RIZ02oVHHJ8H0fGPBtgI/DHfaEakmlEk3Jbmhf12mQyc4yQNwUnOqu uGiQ0VNGaZ1Oy327fHkn2JVOo68gymKdGj2ySnwZ22kI76vUjUmDPEX7xkOx76LhyO03 16uh/HIZdB3otQx83+svILkFAj3th6xV7/AI584VWMKMTC0O/pjZLw+KWMggI1Vc61XT kBK8Kr/3EnzR8sdd3wu0lKCo+yQKCZ1hf5nP7iOagVUi5Poh24Ukk12NudXn9uy9y7CI Q4UQ== X-Received: by 10.152.110.129 with SMTP id ia1mr5539336lab.56.1358441608460; Thu, 17 Jan 2013 08:53:28 -0800 (PST) Received: from builder.office.etersoft.ru (pritvor.etersoft.ru. [91.232.225.2]) by mx.google.com with ESMTPS id z4sm1067635lbn.17.2013.01.17.08.53.26 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Jan 2013 08:53:27 -0800 (PST) From: Pavel Shilovsky 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 8/8] NFSD: Pass share reservations flags to VFS Date: Thu, 17 Jan 2013 20:53:04 +0400 Message-Id: <1358441584-8783-8-git-send-email-piastry@etersoft.ru> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: <1358441584-8783-1-git-send-email-piastry@etersoft.ru> References: <1358441584-8783-1-git-send-email-piastry@etersoft.ru> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org that maps them into O_DENY flags and make them visible for applications that use O_DENYMAND opens. Signed-off-by: Pavel Shilovsky --- fs/locks.c | 1 + fs/nfsd/nfs4state.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/fs/locks.c b/fs/locks.c index ebe9a30..ebdff1f 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -888,6 +888,7 @@ deny_lock_file(struct file *filp) locks_free_lock(lock); return error; } +EXPORT_SYMBOL(deny_lock_file); static int __posix_lock_file(struct inode *inode, struct file_lock *request, struct file_lock *conflock) { diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index d0237f8..4aa2b8f 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -516,6 +516,19 @@ test_deny(u32 access, struct nfs4_ol_stateid *stp) return test_bit(access, &stp->st_deny_bmap); } +static int nfs4_deny_to_odeny(u32 access) +{ + switch (access & NFS4_SHARE_DENY_BOTH) { + case NFS4_SHARE_DENY_READ: + return O_DENYMAND | O_DENYREAD; + case NFS4_SHARE_DENY_WRITE: + return O_DENYWRITE | O_DENYMAND; + case NFS4_SHARE_DENY_BOTH: + return O_DENYREAD | O_DENYWRITE | O_DENYMAND; + } + return O_DENYMAND; +} + static int nfs4_access_to_omode(u32 access) { switch (access & NFS4_SHARE_ACCESS_BOTH) { @@ -2769,6 +2782,21 @@ nfsd4_truncate(struct svc_rqst *rqstp, struct svc_fh *fh, } static __be32 +nfs4_vfs_set_deny(struct nfs4_file *fp, unsigned long share_access, + unsigned long deny_access) +{ + int oflag, rc; + __be32 status = nfs_ok; + + oflag = nfs4_access_to_omode(share_access); + fp->fi_fds[oflag]->f_flags |= nfs4_deny_to_odeny(deny_access); + rc = deny_lock_file(fp->fi_fds[oflag]); + if (rc) + status = nfserrno(rc); + return status; +} + +static __be32 nfs4_upgrade_open(struct svc_rqst *rqstp, struct nfs4_file *fp, struct svc_fh *cur_fh, struct nfs4_ol_stateid *stp, struct nfsd4_open *open) { u32 op_share_access = open->op_share_access; @@ -2789,6 +2817,14 @@ nfs4_upgrade_open(struct svc_rqst *rqstp, struct nfs4_file *fp, struct svc_fh *c } return status; } + status = nfs4_vfs_set_deny(fp, op_share_access, open->op_share_deny); + if (status) { + if (new_access) { + int oflag = nfs4_access_to_omode(op_share_access); + nfs4_file_put_access(fp, oflag); + } + return status; + } /* remember the open */ set_access(op_share_access, stp); set_deny(open->op_share_deny, stp); @@ -3021,7 +3057,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf /* * OPEN the file, or upgrade an existing OPEN. - * If truncate fails, the OPEN fails. + * If truncate or setting deny fails, the OPEN fails. */ if (stp) { /* Stateid was found, this is an OPEN upgrade */ @@ -3035,6 +3071,10 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf status = nfsd4_truncate(rqstp, current_fh, open); if (status) goto out; + status = nfs4_vfs_set_deny(fp, open->op_share_access, + open->op_share_deny); + if (status) + goto out; stp = open->op_stp; open->op_stp = NULL; init_open_stateid(stp, fp, open); @@ -3713,6 +3753,10 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, } nfs4_stateid_downgrade(stp, od->od_share_access); + status = nfs4_vfs_set_deny(stp->st_file, od->od_share_access, + od->od_share_deny); + if (status) + goto out; reset_union_bmap_deny(od->od_share_deny, stp); update_stateid(&stp->st_stid.sc_stateid);