From patchwork Mon Jun 30 15:48:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4451331 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 67E6D9F358 for ; Mon, 30 Jun 2014 15:51:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A8ED52021F for ; Mon, 30 Jun 2014 15:51:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7B7C20375 for ; Mon, 30 Jun 2014 15:51:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754625AbaF3PvL (ORCPT ); Mon, 30 Jun 2014 11:51:11 -0400 Received: from mail-qg0-f50.google.com ([209.85.192.50]:49493 "EHLO mail-qg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754624AbaF3PvK (ORCPT ); Mon, 30 Jun 2014 11:51:10 -0400 Received: by mail-qg0-f50.google.com with SMTP id j5so2125327qga.37 for ; Mon, 30 Jun 2014 08:51:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=DwS/JPXlIm9esfAg800KE4NxA9se7jfTcm8dyMJ99Ug=; b=GJmAlyqRtHftloV6Q+zcjVAAaYcOF2il2g1mbqdM7THO/ivSEpGSA0FZzj3Fgl7DN/ rqrE5+1l6UF8I8PLc2jnBtFVcvIQ5TnuYWqOGlfEEOC3ok420mF3lUil4iVMs91twF9s 2WSOV3aVgMgVuiYldP9TeZ8u34Jn5+1wBWoMHQWy34dkZXFzlnAZKZP4VbnoHIn+znW1 bSjEvUly3NhEKxEsG24Yzd0lKutyEkXRs+eERAr6s4GbYI13VaGUyPsRlBotuk6jvHSB RS1hXfqT9Iru1iY/J3ZFMxz/cLaGU+amLbyWy+NXuvmKLEKw5LVY7mI/RASZ5kPxMycY 1J4A== X-Gm-Message-State: ALoCoQkazRPPW0l3B2dGrMwVzRAa+meeCCMe/QxKQiRGjxMKVoIXhoq+He5lnshi1n5KcsDXn5kv X-Received: by 10.140.104.106 with SMTP id z97mr50084906qge.21.1404143469743; Mon, 30 Jun 2014 08:51:09 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id m1sm32584105qaz.27.2014.06.30.08.51.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jun 2014 08:51:08 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 026/114] nfsd: remove nfs4_file_put_fd Date: Mon, 30 Jun 2014 11:48:55 -0400 Message-Id: <1404143423-24381-27-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404143423-24381-1-git-send-email-jlayton@primarydata.com> References: <1404143423-24381-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 ...and replace it with a simple swap call. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6d8be6c235ca..485a0dc039d5 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -381,24 +381,15 @@ static void nfs4_file_get_access(struct nfs4_file *fp, u32 access) __nfs4_file_get_access(fp, oflag); } -static struct file *nfs4_file_put_fd(struct nfs4_file *fp, int oflag) -{ - struct file *filp; - - filp = fp->fi_fds[oflag]; - fp->fi_fds[oflag] = NULL; - return filp; -} - static void __nfs4_file_put_access(struct nfs4_file *fp, int oflag) { if (atomic_dec_and_lock(&fp->fi_access[oflag], &fp->fi_lock)) { struct file *f1 = NULL; struct file *f2 = NULL; - f1 = nfs4_file_put_fd(fp, oflag); + swap(f1, fp->fi_fds[oflag]); if (atomic_read(&fp->fi_access[1 - oflag]) == 0) - f2 = nfs4_file_put_fd(fp, O_RDWR); + swap(f2, fp->fi_fds[O_RDWR]); spin_unlock(&fp->fi_lock); if (f1) fput(f1);