From patchwork Fri Nov 3 12:00:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10039917 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 BEE0A602DA for ; Fri, 3 Nov 2017 12:00:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4245287D0 for ; Fri, 3 Nov 2017 12:00:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98E1A295B9; Fri, 3 Nov 2017 12:00:30 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 549CE287D0 for ; Fri, 3 Nov 2017 12:00:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756150AbdKCMA1 (ORCPT ); Fri, 3 Nov 2017 08:00:27 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:43870 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756145AbdKCMA0 (ORCPT ); Fri, 3 Nov 2017 08:00:26 -0400 Received: by mail-io0-f196.google.com with SMTP id 134so5740106ioo.0 for ; Fri, 03 Nov 2017 05:00:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XWVEKJz5nBJ5k/0os2NzSF8eZiRRsqLfdjr5OomvC5s=; b=q0nxpxcXzuFzyZvb7YdcKu9PxrqDO85E55ReZU8qPiftHdncjhNZaA8yzyrtyI1VtO 5WQvBW8pktKiAmBF72Dl1yOtvTkLBHjKvhVwvhkcIGxwOO6tcfe/UhyW/wIOVPRzSEHA tRk5xsgTmG9MYNz1uKWbKJSml7zBck9wynf/8qnMTzhfdtqpjChACCtBWL+rtmw4bLUg flR8rBWcPAdd9tQV7YFEG8trs8cjg92ZKoB7BM+JLmyP6QgyWdh6ABYli71x0eHIKpmz /V8RHcAb/1FgnznI+2pOm1Zxl6iDq5MHkNdkGvy+dlsz4ElbQ3zZceVFhabk3tbHIYjg f3wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XWVEKJz5nBJ5k/0os2NzSF8eZiRRsqLfdjr5OomvC5s=; b=Y8a9XUIk3NDwnsy5n4TfBJgBbwxb9gBQlakEHRfjtyRpBXK8vzQCTEaQ0akoOyxdTn 2x/kWSOflDZOwl7ChUrjTI5T6ChQohLsuFlOCz7i/qsnsKLTdCq5PVZOZWJW5SIKWXKU 56OKXnPAl/uXJyuwSIWEsFwESXomPXObAuwE521O6qVL2U1tvRiTpnystTIS0DtwYn19 EFIHkwNvyiCSSIpnsc0U+8UMY7kwKzpzEdhi8W8fTJORL3Ul0sRoecjgKToXJA7v4+PL 9r0k7LMvErlSXX14QfPkC/ieKb3DWO63FOFEiJWBfUHa5K+NXX3Q38CpXJ1rBLzdnHTH E9Tw== X-Gm-Message-State: AMCzsaUSSqRY8rX21mp6PyCLpCzyqVKzzb5Ac7SQgBX7VfIpeA0XGAC5 uc0rV8RNG2I4aXwMn9DNXQ== X-Google-Smtp-Source: ABhQp+SOtYym5CkUOyl+br4eC0FlLxhLaT8XIHIIjvTniRctLAV96Y8dxIom0IPZpStYVluhU3l93w== X-Received: by 10.36.250.139 with SMTP id v133mr7137820ith.13.1509710425425; Fri, 03 Nov 2017 05:00:25 -0700 (PDT) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id k18sm2620923ioc.75.2017.11.03.05.00.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Nov 2017 05:00:22 -0700 (PDT) From: Trond Myklebust To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 3/7] nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0) Date: Fri, 3 Nov 2017 08:00:12 -0400 Message-Id: <20171103120016.6200-4-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171103120016.6200-3-trond.myklebust@primarydata.com> References: <20171103120016.6200-1-trond.myklebust@primarydata.com> <20171103120016.6200-2-trond.myklebust@primarydata.com> <20171103120016.6200-3-trond.myklebust@primarydata.com> 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: Trond Myklebust --- fs/nfsd/nfs4state.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c7dcedbd9c41..5ae6baff09e0 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -63,6 +63,9 @@ static const stateid_t zero_stateid = { static const stateid_t currentstateid = { .si_generation = 1, }; +static const stateid_t close_stateid = { + .si_generation = 0xffffffffU, +}; static u64 current_sessionid = 1; @@ -5388,6 +5391,11 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, nfsd4_close_open_stateid(stp); mutex_unlock(&stp->st_mutex); + /* See RFC5661 sectionm 18.2.4 */ + if (stp->st_stid.sc_client->cl_minorversion) + memcpy(&close->cl_stateid, &close_stateid, + sizeof(close->cl_stateid)); + /* put reference from nfs4_preprocess_seqid_op */ nfs4_put_stid(&stp->st_stid); out: