From patchwork Wed Sep 14 08:37:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miklos Szeredi X-Patchwork-Id: 9330911 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 BC3DE6077F for ; Wed, 14 Sep 2016 08:40:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD49728425 for ; Wed, 14 Sep 2016 08:40:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1AD22882D; Wed, 14 Sep 2016 08:40:20 +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.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 4661628425 for ; Wed, 14 Sep 2016 08:40:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761360AbcINIj7 (ORCPT ); Wed, 14 Sep 2016 04:39:59 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:35784 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755898AbcINIhZ (ORCPT ); Wed, 14 Sep 2016 04:37:25 -0400 Received: by mail-wm0-f51.google.com with SMTP id i130so35529673wmf.0 for ; Wed, 14 Sep 2016 01:37:24 -0700 (PDT) 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=w7dWsqvU3QzboGvmFdfAH01YSIdZCvs1TLsXHkq11v0=; b=U8F7vOQ4vy1tCVK1A7NTVv088uNjy/O8qk6vd0oC7KVhwndFGaTwXmfkpNfa/4uM5b i/eKk/X5CjSc0Du2awaePANaZ+RNHMoUc2kFo7n9Ov6bFs+SUe7nbxGrhlgSW3grq0Bn fRA2x+jBfwwCHcew8hWEP/gq5W6+BZX9RJ12qvdXvvbuqK68NPLnzXQKIDukxEURzI9q TLqU1KMA+CTFP6xNob/WsvgxcRUXkPa67qaIZPLlD5ZzQJN4/dydAMZFGHMEgpTBuAfP jEgXt7BbHUi4Epo1v3atzPStNlVybESoqY969Kuv4bzGLF1pmAwucQ8Xv9pO6VbfzxnV 1/+g== X-Gm-Message-State: AE9vXwN/4efBAQBTzP6yp7ghBtSavcfF/otzY3IhGOP8z4AExhhD8pIsnl2z81W8cwvEX3Qi X-Received: by 10.194.233.102 with SMTP id tv6mr1336410wjc.35.1473842243754; Wed, 14 Sep 2016 01:37:23 -0700 (PDT) Received: from veci.piliscsaba.szeredi.hu (pool-dsl-2c-0018.externet.hu. [217.173.44.24]) by smtp.gmail.com with ESMTPSA id g184sm9533889wme.15.2016.09.14.01.37.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Sep 2016 01:37:22 -0700 (PDT) From: Miklos Szeredi To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Al Viro Subject: [PATCH 04/11] pipe: add pipe_buf_steal() helper Date: Wed, 14 Sep 2016 10:37:09 +0200 Message-Id: <1473842236-28655-5-git-send-email-mszeredi@redhat.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1473842236-28655-1-git-send-email-mszeredi@redhat.com> References: <1473842236-28655-1-git-send-email-mszeredi@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Miklos Szeredi --- drivers/char/virtio_console.c | 2 +- fs/fuse/dev.c | 2 +- include/linux/pipe_fs_i.h | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 5da47e26a012..8114744bf30c 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -889,7 +889,7 @@ static int pipe_to_sg(struct pipe_inode_info *pipe, struct pipe_buffer *buf, return 0; /* Try lock this page */ - if (buf->ops->steal(pipe, buf) == 0) { + if (pipe_buf_steal(pipe, buf) == 0) { /* Get reference and unlock page for moving */ get_page(buf->page); unlock_page(buf->page); diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 9aa757f283e5..6830b3ca1bbb 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -841,7 +841,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) if (cs->len != PAGE_SIZE) goto out_fallback; - if (buf->ops->steal(cs->pipe, buf) != 0) + if (pipe_buf_steal(cs->pipe, buf) != 0) goto out_fallback; newpage = buf->page; diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h index 654413334537..bddccf0159bb 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h @@ -151,6 +151,17 @@ static inline int pipe_buf_confirm(struct pipe_inode_info *pipe, return buf->ops->confirm(pipe, buf); } +/** + * pipe_buf_steal - attempt to take ownership of a pipe_buffer + * @pipe: the pipe that the buffer belongs to + * @buf: the buffer to attempt to steal + */ +static inline int pipe_buf_steal(struct pipe_inode_info *pipe, + struct pipe_buffer *buf) +{ + return buf->ops->steal(pipe, buf); +} + /* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual memory allocation, whereas PIPE_BUF makes atomicity guarantees. */ #define PIPE_SIZE PAGE_SIZE