From patchwork Wed Jul 16 14:31:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4567511 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 1F9349F37C for ; Wed, 16 Jul 2014 14:32:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50F26201BA for ; Wed, 16 Jul 2014 14:32:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 270C9201CD for ; Wed, 16 Jul 2014 14:32:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934298AbaGPOcS (ORCPT ); Wed, 16 Jul 2014 10:32:18 -0400 Received: from mail-qc0-f170.google.com ([209.85.216.170]:40576 "EHLO mail-qc0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934415AbaGPOcR (ORCPT ); Wed, 16 Jul 2014 10:32:17 -0400 Received: by mail-qc0-f170.google.com with SMTP id c9so858418qcz.1 for ; Wed, 16 Jul 2014 07:32:16 -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=OU73Ap+s0LvHmJZfsWB+wS0pqV/PLDAjvdqSJgGCUYQ=; b=V2xRcy5u4McfR2WQ/htXJHJh3r+Ou9sNVuuNjc/DuBhB7SyxJfixiHkP00W3m5bbPB Kv5r2y/l9Vr/NUQqa2Zwp2B3j9uPxC5ootMtVHDldAF++ErIaJCar/OBp4X0rztudS4M thZyKj5WnLw4GfC8oLGk0z26OHVaw1+uqjbHCCuyk+60L8RR/J5b2tK6ctVM1fg7Scw7 l/321ZDXx3qwdKVenF4GuieWvBS4kdFKQLB5WwGnH5SuflxondJ2NgHBXF7AAoS8wyk9 nKpZ9xPylB4zPZ8YpDiSAv5uPfb5ef5pywgeJCCyQJXOnczITin+/zo0DvqnMWrmSyxq UX8Q== X-Gm-Message-State: ALoCoQmRb6c5cHt1vUrriOD5Fo1IzTzEgoH9kukF9k0xTr1FM8mYvmyDMyo6DpbqQxZ+AotkSLVd X-Received: by 10.224.16.139 with SMTP id o11mr9850530qaa.80.1405521136625; Wed, 16 Jul 2014 07:32:16 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id b19sm18654316qaw.44.2014.07.16.07.32.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jul 2014 07:32:15 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: hch@infradead.org, linux-nfs@vger.kernel.org Subject: [PATCH v2 03/10] nfsd: nfs4_alloc_init_lease should take a nfs4_file arg Date: Wed, 16 Jul 2014 10:31:58 -0400 Message-Id: <1405521125-2303-4-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405521125-2303-1-git-send-email-jlayton@primarydata.com> References: <1405521125-2303-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, 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 No need to pass the delegation pointer in here as it's only used to get the nfs4_file pointer. Signed-off-by: Jeff Layton Reviewed-by: Christoph Hellwig --- fs/nfsd/nfs4state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index bdf8ac3393bd..1b01a20827ab 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3474,7 +3474,7 @@ static bool nfsd4_cb_channel_good(struct nfs4_client *clp) return clp->cl_minorversion && clp->cl_cb_state == NFSD4_CB_UNKNOWN; } -static struct file_lock *nfs4_alloc_init_lease(struct nfs4_delegation *dp, int flag) +static struct file_lock *nfs4_alloc_init_lease(struct nfs4_file *fp, int flag) { struct file_lock *fl; @@ -3486,7 +3486,7 @@ static struct file_lock *nfs4_alloc_init_lease(struct nfs4_delegation *dp, int f fl->fl_flags = FL_DELEG; fl->fl_type = flag == NFS4_OPEN_DELEGATE_READ? F_RDLCK: F_WRLCK; fl->fl_end = OFFSET_MAX; - fl->fl_owner = (fl_owner_t)(dp->dl_file); + fl->fl_owner = (fl_owner_t)fp; fl->fl_pid = current->tgid; return fl; } @@ -3497,7 +3497,7 @@ static int nfs4_setlease(struct nfs4_delegation *dp) struct file_lock *fl; int status; - fl = nfs4_alloc_init_lease(dp, NFS4_OPEN_DELEGATE_READ); + fl = nfs4_alloc_init_lease(fp, NFS4_OPEN_DELEGATE_READ); if (!fl) return -ENOMEM; fl->fl_file = find_readable_file(fp);