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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 11A59C2D0DC for ; Tue, 31 Dec 2019 18:06:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE5D6206E6 for ; Tue, 31 Dec 2019 18:06:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577815565; bh=70vBevy4J9nQlxPX3DTzGyimdtIp9FkcU7tji5hsTj4=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=mvRwUDlumKLH9SWtl9ENpoDfPnkAjY+kf3T2el5InjZimOkk3EaGQND7C9uflU8e5 OrjFsswJ8uINoqPfF3C3+hvR19Nlhbdm+hJMCJWE0TO8L8JQH8pBOX7WJ8xN2TPXPG VC6YCngDRSkj/Drlm5ba4sOysh+8hpv/Zz3g3jDo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727121AbfLaSGD (ORCPT ); Tue, 31 Dec 2019 13:06:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:44426 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726720AbfLaSGC (ORCPT ); Tue, 31 Dec 2019 13:06:02 -0500 Received: from zzz.tds (h75-100-12-111.burkwi.broadband.dynamic.tds.net [75.100.12.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 81999206D9 for ; Tue, 31 Dec 2019 18:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577815562; bh=70vBevy4J9nQlxPX3DTzGyimdtIp9FkcU7tji5hsTj4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Tv2vc96n4eFV75kyhilxPvc9cOmqdpC84WziCPqzwGyVTkiOO7YVfdzZgK4Aab7Dh HJurDhLEDThQTCx2+2pBqOfyfTZEbcQZSsPCrfD09jGwuaW1VZjf6ce2KZJ7rGS0QQ vkK7kKGlJ7i1SsIAqAXoGUW7GB1f2rQSULJ4we5s= From: Eric Biggers To: linux-ext4@vger.kernel.org Subject: [PATCH 5/8] ext4: fix documentation for ext4_ext_try_to_merge() Date: Tue, 31 Dec 2019 12:04:41 -0600 Message-Id: <20191231180444.46586-6-ebiggers@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191231180444.46586-1-ebiggers@kernel.org> References: <20191231180444.46586-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers Don't mention the nonexistent return value, and mention both types of merges that are attempted. Signed-off-by: Eric Biggers --- fs/ext4/extents.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 6c3f8c0ca83b..b2dee02ed238 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -1827,13 +1827,14 @@ static void ext4_ext_try_to_merge_up(handle_t *handle, } /* - * This function tries to merge the @ex extent to neighbours in the tree. - * return 1 if merge left else 0. + * This function tries to merge the @ex extent to neighbours in the tree, then + * tries to collapse the extent tree into the inode. */ static void ext4_ext_try_to_merge(handle_t *handle, struct inode *inode, struct ext4_ext_path *path, - struct ext4_extent *ex) { + struct ext4_extent *ex) +{ struct ext4_extent_header *eh; unsigned int depth; int merge_done = 0; -- 2.24.1