From patchwork Sat May 11 02:44:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 2553271 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id E6BA33FC5A for ; Sat, 11 May 2013 02:44:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754337Ab3EKCo7 (ORCPT ); Fri, 10 May 2013 22:44:59 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:50094 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755838Ab3EKCo6 (ORCPT ); Fri, 10 May 2013 22:44:58 -0400 Received: by mail-wg0-f52.google.com with SMTP id k13so4504891wgh.31 for ; Fri, 10 May 2013 19:44:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=KxsdFiH/xqQfqgEH1TWsKBtnoOYvm28yUjvTjUZtELY=; b=oAtuRV/6DXL8j8Il8X/DDWSE1AL7+Ea+5/pjC5zkT8J9LrsMqOPZVhqNxELvSQ95Mw CFYpRnAobfs5S5+0QwgdFcQ0rwpvPAL6c8vmc+rD+gUSgoxjDcjYDMGezNbCS2PFy57h RqinmJZBV85eZgWi3TksQ1RP7Es5XKW/Nd/HsqdmW7j4HJFqG7EvhiroZjqXiEgdRM2p 2eSmWeLv5zn90Ex7wmBQjtbA17DiRWahCV5eabWuatyzzpXljSH/W1XvjHqssLycTRFH ntBvYadS3zEqTh15gteMP0xmWVBQ0z3vbnX5nU1ezLfGnxOsUyKH7Ni3Zt9DyITh0o9J uZPg== X-Received: by 10.194.109.136 with SMTP id hs8mr28283576wjb.8.1368240297193; Fri, 10 May 2013 19:44:57 -0700 (PDT) Received: from bhalevy-lt.il.tonian.com (bzq-79-180-144-28.red.bezeqint.net. [79.180.144.28]) by mx.google.com with ESMTPSA id cw8sm1191619wib.7.2013.05.10.19.44.55 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 May 2013 19:44:55 -0700 (PDT) From: Benny Halevy To: linux-nfs@vger.kernel.org Subject: [PATCH 38/38] pnfsd: remove clientid member from struct nfsd4_layout_seg Date: Sat, 11 May 2013 05:44:51 +0300 Message-Id: <1368240291-1204-1-git-send-email-bhalevy@tonian.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <518B6377.3000207@tonian.com> References: <518B6377.3000207@tonian.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Use layout stateid for identification instead. Signed-off-by: Benny Halevy --- fs/nfsd/nfs4proc.c | 2 -- include/linux/nfsd/nfsd4_pnfs.h | 1 - 2 files changed, 3 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index cd52393..5bbd1a3 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1243,8 +1243,6 @@ static int fill_in_write_vector(struct kvec *vec, struct nfsd4_write *write) __func__, lcp->args.lc_newoffset, lcp->args.lc_last_wr + 1, ino->i_size); - /* Set clientid from sessionid */ - copy_clientid((clientid_t *)&lcp->args.lc_seg.clientid, cstate->session); lcp->res.lc_size_chg = 0; if (sb->s_pnfs_op->layout_commit) { status = sb->s_pnfs_op->layout_commit(ino, &lcp->args, &lcp->res); diff --git a/include/linux/nfsd/nfsd4_pnfs.h b/include/linux/nfsd/nfsd4_pnfs.h index 2e09065..fd7bad9 100644 --- a/include/linux/nfsd/nfsd4_pnfs.h +++ b/include/linux/nfsd/nfsd4_pnfs.h @@ -59,7 +59,6 @@ struct nfsd4_pnfs_dev_iter_res { }; struct nfsd4_layout_seg { - u64 clientid; u32 layout_type; u32 iomode; u64 offset;