From patchwork Fri Apr 20 14:21:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 10352821 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 45BD66023A for ; Fri, 20 Apr 2018 14:24:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36B272853A for ; Fri, 20 Apr 2018 14:24:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B59D2878E; Fri, 20 Apr 2018 14:24:25 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 C410728789 for ; Fri, 20 Apr 2018 14:24:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755247AbeDTOYW (ORCPT ); Fri, 20 Apr 2018 10:24:22 -0400 Received: from mx2.suse.de ([195.135.220.15]:58822 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755226AbeDTOYV (ORCPT ); Fri, 20 Apr 2018 10:24:21 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A4AF1AEC2 for ; Fri, 20 Apr 2018 14:24:19 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 5D4DDDAE0B; Fri, 20 Apr 2018 16:21:48 +0200 (CEST) From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH 2/6] btrfs: add wrapper to switch clearing operation Date: Fri, 20 Apr 2018 16:21:48 +0200 Message-Id: <82f2aa3817650cc83517f448adbacb44e8ef5791.1524233244.git.dsterba@suse.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: References: Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: David Sterba --- fs/btrfs/extent-tree.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index ffdd3aba508c..b317f8ee42a9 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -2034,6 +2034,18 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans, return ret; } +static int btrfs_issue_clear_op(struct block_device *bdev, u64 start, u64 size, + enum btrfs_clear_op_type clear) +{ + switch (clear) { + case BTRFS_CLEAR_OP_DISCARD: + return blkdev_issue_discard(bdev, start >> 9, size >> 9, + GFP_NOFS, 0); + default: + return -EOPNOTSUPP; + } +} + #define in_range(b, first, len) ((b) >= (first) && (b) < (first) + (len)) static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, u64 *discarded_bytes, @@ -2081,13 +2093,8 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, bytes_left = end - start; continue; } - if (size) { - if (clear == BTRFS_CLEAR_OP_DISCARD) - ret = blkdev_issue_discard(bdev, start >> 9, - size >> 9, GFP_NOFS, 0); - else - ret = -EOPNOTSUPP; + ret = btrfs_issue_clear_op(bdev, start, size, clear); if (!ret) *discarded_bytes += size; else if (ret != -EOPNOTSUPP) @@ -2103,11 +2110,7 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, } if (bytes_left) { - if (clear == BTRFS_CLEAR_OP_DISCARD) - ret = blkdev_issue_discard(bdev, start >> 9, - bytes_left >> 9, GFP_NOFS, 0); - else - ret = -EOPNOTSUPP; + ret = btrfs_issue_clear_op(bdev, start, bytes_left, clear); if (!ret) *discarded_bytes += bytes_left; }