From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27758C43381 for ; Wed, 20 Feb 2019 15:11:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDC652086D for ; Wed, 20 Feb 2019 15:11:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727255AbfBTPLt (ORCPT ); Wed, 20 Feb 2019 10:11:49 -0500 Received: from mx2.suse.de ([195.135.220.15]:55352 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727233AbfBTPLs (ORCPT ); Wed, 20 Feb 2019 10:11:48 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 2377AB67D for ; Wed, 20 Feb 2019 15:11:47 +0000 (UTC) From: Nikolay Borisov To: linux-btrfs@vger.kernel.org Cc: Nikolay Borisov Subject: [PATCH v2 6/6] btrfs: Factor out common extent locking code in submit_compressed_extents Date: Wed, 20 Feb 2019 17:11:43 +0200 Message-Id: <20190220151143.19057-7-nborisov@suse.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190220151143.19057-1-nborisov@suse.com> References: <20190220151143.19057-1-nborisov@suse.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Irrespective of whether the compress code fell back to uncompressed or a compressed extent has to be submitted, the extent range is always locked. So factor out the common lock_extent call at the beginning of the loop. No functional changes just removes one duplicate lock_extent call. Signed-off-by: Nikolay Borisov --- fs/btrfs/inode.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 06408a278200..02b393328a7c 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -731,15 +731,14 @@ static noinline void submit_compressed_extents(struct async_cow *async_cow) struct async_extent, list); list_del(&async_extent->list); retry: + + lock_extent(io_tree, async_extent->start, + async_extent->start + async_extent->ram_size - 1); /* did the compression code fall back to uncompressed IO? */ if (!async_extent->pages) { int page_started = 0; unsigned long nr_written = 0; - lock_extent(io_tree, async_extent->start, - async_extent->start + - async_extent->ram_size - 1); - /* allocate blocks */ ret = cow_file_range(inode, async_cow->locked_page, async_extent->start, @@ -771,9 +770,6 @@ static noinline void submit_compressed_extents(struct async_cow *async_cow) continue; } - lock_extent(io_tree, async_extent->start, - async_extent->start + async_extent->ram_size - 1); - ret = btrfs_reserve_extent(root, async_extent->ram_size, async_extent->compressed_size, async_extent->compressed_size, -- 2.17.1