From patchwork Tue Nov 17 11:52:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7636131 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 64B4CBF90C for ; Tue, 17 Nov 2015 11:53:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8AD8E204EC for ; Tue, 17 Nov 2015 11:53:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B2211204E2 for ; Tue, 17 Nov 2015 11:53:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753591AbbKQLxu (ORCPT ); Tue, 17 Nov 2015 06:53:50 -0500 Received: from mail-qg0-f52.google.com ([209.85.192.52]:33161 "EHLO mail-qg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752922AbbKQLxf (ORCPT ); Tue, 17 Nov 2015 06:53:35 -0500 Received: by qgea14 with SMTP id a14so3417766qge.0 for ; Tue, 17 Nov 2015 03:53:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poochiereds_net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nmnq0iBhfff4a4FxrgeimP7DJqvFnFbKbTg5KqzNTr8=; b=IixlDWN2b4FSyt+ySRadgHc2F0JZ76QA/CWWMQz7zZlzeoGEOnTbuG+vUxwi5X6tia Yv+5Z4tSv8nR+talSNQhnQFqgyHPcMenWHscntng59BK2Ccr9oZHUq2S3KKsEtF8tUfd 8jf60tjzD9IYPRh9vV1u372dkSMEOIkVSx7KZeK3VlgJnz+AzPHAmESc2JK6+u2TU3eK FpP6sxPCkt4R3PXaVBThEGgGLA3GjC/WqsM7houX8SWPXmWPVyuULTf8eEayDqELKAZ6 HwCkhrnCJaChuEbFMoX0dSqMlLXFiJt0+9h1j/pk/h8tLxCxSN52PinHaqTk9H5tK8lr yw4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nmnq0iBhfff4a4FxrgeimP7DJqvFnFbKbTg5KqzNTr8=; b=avgrd5ZHaB4PhFavz4Iakb531lilUFAiLLwE/EG3XTcF2i9Zm22roNlYf8J/RY/ZTT bA9vkEuOi1AJ4IJZNDzNn8eRlglslFAbax10fJDp39+xCDKPrREMW+h1DVu+b2l1m2Nt Ofu/yrjGWip4yvf5yvwQ46B6USNNdZNegVMiMPTX1t8uIQJsZxceRpeQu95khXZBZZYm ZrvCWMMGf5aUy/QM/sYk+OqbZWf4abRziR+3Gf+hHz44isSowusdVt23sTiC0Wt3w+tF zBC8ZXuFtQ6FGaYF7pLQz0zEz6fjx22OEyU6bearZap0l3G3rEhXONqmZW6TtPe3Cq9x 9Spw== X-Gm-Message-State: ALoCoQmEXmeOuAxRjzSTpmhCe/Kc4y+H7jAhgoi0oZwIc+QNab49mRDHsXtbwtdi2al24VOxtLrL X-Received: by 10.141.1.6 with SMTP id c6mr44186158qhd.9.1447761214349; Tue, 17 Nov 2015 03:53:34 -0800 (PST) Received: from tlielax.poochiereds.net ([2606:a000:1125:4075::d5a]) by smtp.googlemail.com with ESMTPSA id w10sm1583910qhc.16.2015.11.17.03.53.33 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Nov 2015 03:53:33 -0800 (PST) From: Jeff Layton X-Google-Original-From: Jeff Layton To: bfields@fieldses.org, trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org, Eric Paris , Alexander Viro , linux-fsdevel@vger.kernel.org Subject: [PATCH v1 16/38] nfsd: hook up nfsd_read to the nfsd_file cache Date: Tue, 17 Nov 2015 06:52:38 -0500 Message-Id: <1447761180-4250-17-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1447761180-4250-1-git-send-email-jeff.layton@primarydata.com> References: <1447761180-4250-1-git-send-email-jeff.layton@primarydata.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jeff Layton --- fs/nfsd/vfs.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 0f31af897d4c..0873c1355bb1 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1003,27 +1003,19 @@ out_nfserr: __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset, struct kvec *vec, int vlen, unsigned long *count) { - struct file *file; - struct raparms *ra; - __be32 err; + __be32 err; + struct nfsd_file *nf; trace_read_start(rqstp, fhp, offset, vlen); - err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file); - if (err) - return err; - - ra = nfsd_init_raparms(file); - - trace_read_opened(rqstp, fhp, offset, vlen); - err = nfsd_vfs_read(rqstp, file, offset, vec, vlen, count); - trace_read_io_done(rqstp, fhp, offset, vlen); - - if (ra) - nfsd_put_raparams(file, ra); - fput(file); - + err = nfsd_file_acquire(rqstp, fhp, NFSD_MAY_READ, &nf); + if (err == nfs_ok) { + trace_read_opened(rqstp, fhp, offset, vlen); + err = nfsd_vfs_read(rqstp, nf->nf_file, offset, vec, vlen, + count); + trace_read_io_done(rqstp, fhp, offset, vlen); + nfsd_file_put(nf); + } trace_read_done(rqstp, fhp, offset, vlen); - return err; }