From patchwork Fri Dec 23 01:32:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 9487103 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D555B62AAC for ; Fri, 23 Dec 2016 01:32:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C69212807E for ; Fri, 23 Dec 2016 01:32:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA7E028113; Fri, 23 Dec 2016 01:32:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 512EA2807E for ; Fri, 23 Dec 2016 01:32:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753060AbcLWBcc (ORCPT ); Thu, 22 Dec 2016 20:32:32 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:36642 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752060AbcLWBcb (ORCPT ); Thu, 22 Dec 2016 20:32:31 -0500 Received: by mail-pg0-f68.google.com with SMTP id n5so677571pgh.3 for ; Thu, 22 Dec 2016 17:32:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=2JHGOfFoySh80aYhiZhgpXU7jCUgZ1dRw1kX8WDdNjw=; b=U/3qrcYehZxnnvpWNbABXQXqBLKM11eOnZOG8pbKaykQVkxJ189UGNAb6mBmlrzSo8 RsaKLsXrxqXLi4EAv1GQLa5dZtKxN6+xSCnieQBrR7RMXPfLZAlcVdL/7bKmx0artEjN 5/8ecMDpx6AEexkoScZr17xWHeymA06j9gU3vP1jhakW1eSI0724Hj7AoTCFWAxX7YRR kOMKS6yMKid8DRXJKej6Nm7DM4HLXCMceBCwWOm2ckaV/0y9kq7ZQR791W+dAmQLLGKG mbCO4Js6ioQ/6/YdPUPQxw43lmYeIn3MfwVn3RJVVSVDy9rISPN0dB9z8xgrolEmsftI brjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=2JHGOfFoySh80aYhiZhgpXU7jCUgZ1dRw1kX8WDdNjw=; b=Lgz3uKUkq/s/BhYx8cMkxlSQl181iw6dWQJpgzNm/IsO3UrVrZiFHc3Wg05fhPZxU6 KsABGDykZ8bslOG2ugDByNEXl2nIthUIrAhtr/KnBxis4EZ1dlk9M3F4qMvLf1+tl2Wh MCkHuZqHedFhQZjE+mWTJht9bra/QzzPRX4oC5aacEwUqv3qhGANH+YTkXQ3jAJvpW2D unIPxlzl0qMAhdyr5ibawiQYck/W81KNs0jfsFXCJEIxWR6vXaz8bZN/iFkB5pPtK97p O6kTd+tRrX7v0TesWwYFQFU9R1mpeMt7b2hNc4VTwNfADjIKA3gNAswFG4C/OmjTW27g YB/A== X-Gm-Message-State: AIkVDXIrVyr8KVUEkv6vHfwcu94mzKxn4LIsDzNcNz3WMhjmXvBCCZqXjLK052CXtMSdBw== X-Received: by 10.99.52.10 with SMTP id b10mr22342012pga.42.1482456750621; Thu, 22 Dec 2016 17:32:30 -0800 (PST) Received: from [192.168.10.105] ([119.85.99.205]) by smtp.gmail.com with ESMTPSA id w5sm57512983pfl.31.2016.12.22.17.32.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Dec 2016 17:32:30 -0800 (PST) To: "J. Bruce Fields" , linux-nfs@vger.kernel.org Cc: kinglongmee@gmail.com From: Kinglong Mee Subject: [PATCH 2/3] NFSD: cleanup dead codes and values in nfsd_write Message-ID: <5cd74fe8-37ac-ff17-3b17-c9b0032e3196@gmail.com> Date: Fri, 23 Dec 2016 09:32:25 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Kinglong Mee Reviewed-by: Christoph Hellwig --- fs/nfsd/nfs3proc.c | 2 +- fs/nfsd/nfsproc.c | 2 +- fs/nfsd/vfs.c | 35 +++++++++++------------------------ fs/nfsd/vfs.h | 4 ++-- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index 69cd0f1..ec7a63f 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -193,7 +193,7 @@ nfsd3_proc_write(struct svc_rqst *rqstp, struct nfsd3_writeargs *argp, fh_copy(&resp->fh, &argp->fh); resp->committed = argp->stable; - nfserr = nfsd_write(rqstp, &resp->fh, NULL, + nfserr = nfsd_write(rqstp, &resp->fh, argp->offset, rqstp->rq_vec, argp->vlen, &cnt, diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index f157c7e..45ca598 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -210,7 +210,7 @@ nfsd_proc_write(struct svc_rqst *rqstp, struct nfsd_writeargs *argp, SVCFH_fmt(&argp->fh), argp->len, argp->offset); - nfserr = nfsd_write(rqstp, fh_copy(&resp->fh, &argp->fh), NULL, + nfserr = nfsd_write(rqstp, fh_copy(&resp->fh, &argp->fh), argp->offset, rqstp->rq_vec, argp->vlen, &cnt, diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index cc80d2d..cba7c30 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1034,35 +1034,22 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp, * N.B. After this call fhp needs an fh_put */ __be32 -nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, - loff_t offset, struct kvec *vec, int vlen, unsigned long *cnt, - int stable) +nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset, + struct kvec *vec, int vlen, unsigned long *cnt, int stable) { - __be32 err = 0; + struct file *file = NULL; + __be32 err = 0; trace_write_start(rqstp, fhp, offset, vlen); - if (file) { - err = nfsd_permission(rqstp, fhp->fh_export, fhp->fh_dentry, - NFSD_MAY_WRITE|NFSD_MAY_OWNER_OVERRIDE); - if (err) - goto out; - trace_write_opened(rqstp, fhp, offset, vlen); - err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen, cnt, - stable); - trace_write_io_done(rqstp, fhp, offset, vlen); - } else { - err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_WRITE, &file); - if (err) - goto out; + err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_WRITE, &file); + if (err) + goto out; - trace_write_opened(rqstp, fhp, offset, vlen); - if (cnt) - err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen, - cnt, stable); - trace_write_io_done(rqstp, fhp, offset, vlen); - fput(file); - } + trace_write_opened(rqstp, fhp, offset, vlen); + err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen, cnt, stable); + trace_write_io_done(rqstp, fhp, offset, vlen); + fput(file); out: trace_write_done(rqstp, fhp, offset, vlen); return err; diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h index 8458d8c..db98c48 100644 --- a/fs/nfsd/vfs.h +++ b/fs/nfsd/vfs.h @@ -83,8 +83,8 @@ __be32 nfsd_readv(struct file *, loff_t, struct kvec *, int, unsigned long *); __be32 nfsd_read(struct svc_rqst *, struct svc_fh *, loff_t, struct kvec *, int, unsigned long *); -__be32 nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *, - loff_t, struct kvec *,int, unsigned long *, int); +__be32 nfsd_write(struct svc_rqst *, struct svc_fh *, loff_t, + struct kvec *, int, unsigned long *, int); __be32 nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, loff_t offset, struct kvec *vec, int vlen, unsigned long *cnt,