From patchwork Wed Jan 14 16:44:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 5633551 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 DBF3C9F357 for ; Wed, 14 Jan 2015 16:46:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 21BB820123 for ; Wed, 14 Jan 2015 16:46:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4CE93200F4 for ; Wed, 14 Jan 2015 16:46:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753871AbbANQqV (ORCPT ); Wed, 14 Jan 2015 11:46:21 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:65297 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754015AbbANQqU (ORCPT ); Wed, 14 Jan 2015 11:46:20 -0500 Received: by mail-pa0-f48.google.com with SMTP id rd3so11515570pab.7 for ; Wed, 14 Jan 2015 08:46:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=anLIbt8kUGHENfmoM1/WkGifLw94kjVhlmueUATkca0=; b=llvI/kX34UQVJZr+QrdGmcMsw/QbMjY210NOtls8Le3dO+/bkVxb3B73FMiC/vvLgQ HCMeTD4wIk6qECRjo+/zXe/LsTkHKPmFob0Lw1cVuEianNoDPszForkzXPzr93JbgkZP YShx4qVn7n0uZ5sdIJpG8ZgU+s9Nz5AIyhLG81MOJx5vGySqZQUj5OGt8LBPcwu1aOrU ch/p9pw+XpoV9JUObawFBiRcIOrBXxX5K25EsfOSSjMkT8oQgMCONpUZHePZKRejvPmz CoAO5d61i5Kxg3D1mk9SjIek/psDstKjnnxizslenkxyznUxCRkAlNHZh4OJQPFvLpk+ 2tFA== X-Gm-Message-State: ALoCoQnvDWETM8LaxGBIprUVxqwMePrLaUYs3t02ancyPYNLK9M9DjOe6I+8slN3WZHMPw6/M0x4 X-Received: by 10.68.129.197 with SMTP id ny5mr7277255pbb.34.1421253979651; Wed, 14 Jan 2015 08:46:19 -0800 (PST) Received: from localhost.localdomain ([50.242.95.105]) by mx.google.com with ESMTPSA id u7sm12239039pdp.45.2015.01.14.08.46.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jan 2015 08:46:19 -0800 (PST) From: Tom Haynes X-Google-Original-From: Tom Haynes To: Trond Myklebust Cc: Linux NFS Mailing list Subject: [PATCH v4 47/50] nfs: add a helper to set NFS_ODIRECT_RESCHED_WRITES to direct writes Date: Wed, 14 Jan 2015 08:44:53 -0800 Message-Id: <1421253896-73106-48-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1421253896-73106-1-git-send-email-loghyr@primarydata.com> References: <1421253896-73106-1-git-send-email-loghyr@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 From: Peng Tao To allow pnfs LD to ask direct writes to be resend. Signed-off-by: Peng Tao --- fs/nfs/direct.c | 6 ++++++ fs/nfs/internal.h | 1 + 2 files changed, 7 insertions(+) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index eb81478..4fad6b7 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -116,6 +116,12 @@ static inline int put_dreq(struct nfs_direct_req *dreq) return atomic_dec_and_test(&dreq->io_count); } +void nfs_direct_set_resched_writes(struct nfs_direct_req *dreq) +{ + dreq->flags = NFS_ODIRECT_RESCHED_WRITES; +} +EXPORT_SYMBOL_GPL(nfs_direct_set_resched_writes); + static void nfs_direct_good_bytes(struct nfs_direct_req *dreq, struct nfs_pgio_header *hdr) { diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index ffe4b7a..44e8496 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -502,6 +502,7 @@ static inline void nfs_inode_dio_wait(struct inode *inode) inode_dio_wait(inode); } extern ssize_t nfs_dreq_bytes_left(struct nfs_direct_req *dreq); +extern void nfs_direct_set_resched_writes(struct nfs_direct_req *dreq); /* nfs4proc.c */ extern void __nfs4_read_done_cb(struct nfs_pgio_header *);