From patchwork Fri Apr 20 14:21:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 10352829 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 892C4602B1 for ; Fri, 20 Apr 2018 14:24:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A62028789 for ; Fri, 20 Apr 2018 14:24:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F7752878F; Fri, 20 Apr 2018 14:24:32 +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 1DB5C28789 for ; Fri, 20 Apr 2018 14:24:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755263AbeDTOYa (ORCPT ); Fri, 20 Apr 2018 10:24:30 -0400 Received: from mx2.suse.de ([195.135.220.15]:58882 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755160AbeDTOY3 (ORCPT ); Fri, 20 Apr 2018 10:24:29 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id C830BAEBF for ; Fri, 20 Apr 2018 14:24:28 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 6A85FDAE0B; Fri, 20 Apr 2018 16:21:57 +0200 (CEST) From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH 6/6] btrfs: add more zeroout modes for clearing unused space Date: Fri, 20 Apr 2018 16:21:57 +0200 Message-Id: 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 | 12 +++++++++++- include/uapi/linux/btrfs.h | 5 +++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 285bace8e2c6..bd2ac5779998 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -2046,9 +2046,19 @@ static int btrfs_issue_clear_op(struct block_device *bdev, u64 start, u64 size, case BTRFS_CLEAR_OP_DISCARD: return blkdev_issue_discard(bdev, start >> 9, size >> 9, GFP_NOFS, flags); + case BTRFS_CLEAR_OP_ZERO_NOUNMAP: + flags = BLKDEV_ZERO_NOUNMAP; + goto zeroout; + case BTRFS_CLEAR_OP_ZERO_NOFALLBACK: + flags = BLKDEV_ZERO_NOFALLBACK; + goto zeroout; + case BTRFS_CLEAR_OP_ZERO_NOUNMAP_NOFALLBACK: + flags = BLKDEV_ZERO_NOUNMAP | BLKDEV_ZERO_NOFALLBACK; + /* fall through */ case BTRFS_CLEAR_OP_ZERO: +zeroout: return blkdev_issue_zeroout(bdev, start >> 9, size >> 9, - GFP_NOFS, 0); + GFP_NOFS, flags); default: return -EOPNOTSUPP; } diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 1becbb241e53..5d1f13045906 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -744,6 +744,11 @@ enum btrfs_clear_op_type { BTRFS_CLEAR_OP_DISCARD = 0, BTRFS_CLEAR_OP_ZERO, BTRFS_CLEAR_OP_DISCARD_SECURE, + + /* Fine tuning for clearing by zeros, see __blkdev_issue_zeroout */ + BTRFS_CLEAR_OP_ZERO_NOUNMAP, + BTRFS_CLEAR_OP_ZERO_NOFALLBACK, + BTRFS_CLEAR_OP_ZERO_NOUNMAP_NOFALLBACK, BTRFS_NR_CLEAR_OP_TYPES, };