From patchwork Mon Jan 4 18:21:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 7950001 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 52C789F6CD for ; Mon, 4 Jan 2016 18:22:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 79853202B4 for ; Mon, 4 Jan 2016 18:22:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2D03202DD for ; Mon, 4 Jan 2016 18:22:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752289AbcADSWD (ORCPT ); Mon, 4 Jan 2016 13:22:03 -0500 Received: from mail-io0-f172.google.com ([209.85.223.172]:32930 "EHLO mail-io0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752313AbcADSV7 (ORCPT ); Mon, 4 Jan 2016 13:21:59 -0500 Received: by mail-io0-f172.google.com with SMTP id q21so162464376iod.0 for ; Mon, 04 Jan 2016 10:21:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=primarydata-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=yxTE71WLyoTZyA07c0h1QYuE+eLPsTRHH8ExXFbBYMY=; b=KQK/zXsTCqyCy6iQs2HbtqBUmz9vomzah7dT2Yvc1hz3FKLUwShz0hXJ95vp/Z81qB KkpiK6b4khDqa0fP99iap4k1pjToGN5uKV8LHuPSZyOmtubkDVMfmGIwkYrIPOLGJ4W3 Mpiq6vsZafuVSI6yTBLWzOiznD/rvHRskx6u91snbr/r7v09rXkCgAJi+yxRd3kxBWBd 6c0IEfBuOHEg28nkEtoiH17ZMVEsi4ZAKdc7dC+sxSKsPxC6NksbhbrkBJfvUFUNWvH1 oxZxxn3rrN/CSPm2NpI/mAARSLq68iD8hLvaPdwF9tBy96sXFAShPGoe4n9DEwLFKfIf dQPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=yxTE71WLyoTZyA07c0h1QYuE+eLPsTRHH8ExXFbBYMY=; b=hV2V4WzuGaamqDyj1Zq7SENIsRJT/KtORqOXsTjcthq4gQ5KPqDMBB52CxmzvcgB8Q IDggzxnN+cK46LvmfuhVK/ZnINQeLVRHwpDzqPJcE32uwXNlcUOExgXLKTcFMZQoRpHl w8L6j9KkIEPBLdAEqu8wI4VMjUuhH4zZkzQrFPYZ6QMju7Vpvs+pEWNtbJo0BxJG/hS6 kb959lAvpXRBDsrE80FUf6imzyefLWqVce1zb++8xn90rbaYY/VyOLTL+MEsVAAwH0dm cNwcyxgC0+ZK8wHrr7WtunQIDoLu6/jmJInWHkyLNbBW5Zkf50vWY3W8Rdx+5KCMtyXw hXqw== X-Gm-Message-State: ALoCoQnUsvgocCAuqMHCjarmzX2+zc5o2AOpeS/znzYUkEin2V3P9cnemtWl76QNh4pGDj1QJB+ezjid3dhRf58wV7GbrJxNaA== X-Received: by 10.107.166.78 with SMTP id p75mr76087010ioe.59.1451931718813; Mon, 04 Jan 2016 10:21:58 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-68-49-164-203.hsd1.mi.comcast.net. [68.49.164.203]) by smtp.gmail.com with ESMTPSA id n6sm12760568ige.12.2016.01.04.10.21.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jan 2016 10:21:58 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v3 17/18] NFSv4.1/pnfs: Cleanup copying of pnfs_layout_range structures Date: Mon, 4 Jan 2016 13:21:15 -0500 Message-Id: <1451931676-68481-17-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1451931676-68481-16-git-send-email-trond.myklebust@primarydata.com> References: <1451931676-68481-1-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-2-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-3-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-4-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-5-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-6-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-7-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-8-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-9-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-10-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-11-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-12-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-13-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-14-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-15-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-16-git-send-email-trond.myklebust@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.8 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: Trond Myklebust --- fs/nfs/pnfs.c | 4 ++-- fs/nfs/pnfs.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index f86f060f853d..ebf896b54d9d 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -863,7 +863,7 @@ pnfs_choose_layoutget_stateid(nfs4_stateid *dst, struct pnfs_layout_hdr *lo, static struct pnfs_layout_segment * send_layoutget(struct pnfs_layout_hdr *lo, struct nfs_open_context *ctx, - struct pnfs_layout_range *range, + const struct pnfs_layout_range *range, gfp_t gfp_flags) { struct inode *ino = lo->plh_inode; @@ -896,7 +896,7 @@ send_layoutget(struct pnfs_layout_hdr *lo, lgp->args.minlength = i_size - range->offset; } lgp->args.maxcount = PNFS_LAYOUT_MAXSIZE; - lgp->args.range = *range; + pnfs_copy_range(&lgp->args.range, range); lgp->args.type = server->pnfs_curr_ld->id; lgp->args.inode = ino; lgp->args.ctx = get_nfs_open_context(ctx); diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 3d0f513a4a77..dcc76335fd4b 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -578,6 +578,13 @@ pnfs_mark_layout_returned_if_empty(struct pnfs_layout_hdr *lo) set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags); } +static inline void +pnfs_copy_range(struct pnfs_layout_range *dst, + const struct pnfs_layout_range *src) +{ + memcpy(dst, src, sizeof(*dst)); +} + extern unsigned int layoutstats_timer; #ifdef NFS_DEBUG