From patchwork Tue Dec 16 19:01:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 5503221 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 89D19BEEA8 for ; Tue, 16 Dec 2014 19:03:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F160209DC for ; Tue, 16 Dec 2014 19:03:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB6E7209D2 for ; Tue, 16 Dec 2014 19:03:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751332AbaLPTDk (ORCPT ); Tue, 16 Dec 2014 14:03:40 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:45081 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750986AbaLPTDj (ORCPT ); Tue, 16 Dec 2014 14:03:39 -0500 Received: by mail-pa0-f45.google.com with SMTP id lf10so14038515pab.4 for ; Tue, 16 Dec 2014 11:03:39 -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=YI0k1AGCVkCv5CLu9hRwN4MacVJBRgYIgDY3Dd9i2g4=; b=VoTQq9lfWgNXJyqDgKSqHZHY3/m20rW6O9jLPA1JXTp5tP+0a0N0oySIay516lLh70 05JLKd16cAQ6EeteGDZvHzNYyTdCVQRt32hSliEKUhd5hTJuBbK0w899aT/eQnl2/h+g QPhXre7Moon7wyc8izmkWk/gKSFKXy1bAXb/Ih+6pUul6+uCWwv1wMeADvv4gMqXg0Kb HACfIOQrj6hBJJmDgwNzplAMRM7wWiEqx+2ELOb6TUHiAqCdtAGjQE/OicTFtn4U7G8k gFbVzOwUONydlm8QWAOfRYP9mpOhI2G+IZ9hxlei/pDehbfBjfl0NM+k6RK57K/xB5sZ zZyA== X-Gm-Message-State: ALoCoQn555WTGY/CIyQrYgurbVavFcRSoFJj9SPfOQLVr541kfHET/dQu6KvkNkyX4RPcdU4vzrn X-Received: by 10.70.133.69 with SMTP id pa5mr7320076pdb.59.1418756618930; Tue, 16 Dec 2014 11:03:38 -0800 (PST) Received: from localhost.localdomain ([50.242.95.105]) by mx.google.com with ESMTPSA id q4sm1620669pdh.79.2014.12.16.11.03.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Dec 2014 11:03:38 -0800 (PST) From: Tom Haynes X-Google-Original-From: Tom Haynes To: Trond Myklebust Cc: Linux NFS Mailing List Subject: [PATCH 48/50] nfs: add a helper to set NFS_ODIRECT_RESCHED_WRITES to direct writes Date: Tue, 16 Dec 2014 11:01:51 -0800 Message-Id: <1418756513-95187-49-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1418756513-95187-1-git-send-email-loghyr@primarydata.com> References: <1418756513-95187-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 c08c09f..ff99d09 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -505,6 +505,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 *);