From patchwork Sun Nov 29 02:02:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1407775 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=PnOt4YPv; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CkBWC1SHmz9sSf for ; Sun, 29 Nov 2020 13:04:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8656C8278F; Sun, 29 Nov 2020 03:03:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="PnOt4YPv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7253382749; Sun, 29 Nov 2020 03:02:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BCF968274E for ; Sun, 29 Nov 2020 03:02:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1606615353; bh=zPd9/fSzNQ39WR7MnOA3pd76M547aXsyDDCrym0++VE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=PnOt4YPvxp1iSopltqRT7aP3Kc+FMMZhZZn8rVTW6F4VKjr8D6qeVTy7qE9PfrX+I 3iyUbg/2HDiOyBCnEco8oPD2GtxAHuoEM8ADd9CLB6wQiRVkOFHCQCqyssZztmhL0a XtIoHDemtElwH6xDDN6ASc8gwCoL/u8KKya+tNRw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from mcbin.fritz.box ([62.143.246.89]) by mail.gmx.com (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MnakR-1kJnNU2tK1-00jc6a; Sun, 29 Nov 2020 03:02:33 +0100 From: Heinrich Schuchardt To: Tom Rini Cc: Simon Glass , Christian Gmeiner , Jason Wessel , AKASHI Takahiro , Marek Szyprowski , Bin Meng , Reuben Dowle , Marcin Juszkiewicz , Thomas Hebb , Samer El-Haj-Mahmoud , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 10/18] fs: fat: dentry iterator for fill_dir_slot() Date: Sun, 29 Nov 2020 03:02:08 +0100 Message-Id: <20201129020216.4865-11-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201129020216.4865-1-xypron.glpk@gmx.de> References: <20201129020216.4865-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:Lik4y9+6j1U6QrEvUDtXlfgk2z0qZil5o9YgV6H5ROY80PWmFFb n2t/npcVSI5k+CdmuyTtFCyFyIrIRW0scrNXkLjw/kvPKEGudWh3xxJ+DrpPj96EyY02SHg 0iqCEoiS9NuezE0LJdqjikOWLG6JVTpjIMhc74riPF3f7gK+5E2geJtKJw4J3eKG67fYpuw 9nKb1XfeFrXtDzBAz5Rpg== X-UI-Out-Filterresults: notjunk:1;V03:K0:BXuAW9hAPio=:EPLvCkhQYD1jqNM3NRAR49 XCW3e5EeFJZMbG0A+iNM0ltayPqutGiGDJqAa4DDg7Mj3iltkfHZ0xie2yUEXzSakVlwtstdH VSrDG/5tRbBVnSO3gsGnNZmBWyO9TfQ99yWxvqMaTL0YGcZPflfyVQxUe5IoBs7bKzqbnKwDC xETl1ZECendiYYa7ssPa+PVmZrKoLzBY5pVNSQ+Z1AYi3XhCrfvjaTn7QxXxEhqPiCPsbtAUp 1pWZyC2/cQ8v+cp6nrOolkmLOrEARjOEB5L8USWiHfuFAQkaHQebVDJVFTBEML5JvN0V7l/TH SJxp4QbGbkzmrgCdRR6Gj8ZtfNKAKpnzHiQpkar8oLPGX8xsiSbg5C+vzfXidOEP5w1We+s94 qI57wvK8vXHMms5oGv0K6enlMiRYwcoVcC6xZgKsQG5BgX6hw07A9bnb/YWLZuvaVPHQk5D0b ar0+kttkwak4gHQeT38WiKbFQSMn6i+VR9FbicEN4D1s/zaooTEpq8tj3RJksaHHM4qwGHmHQ RzEePR2QJ1nTPL4zZDqYL7Mn4NcSeMUi++XHjwYLlu7ahz2IzDOrM1m7Xt8Mf2ALmoQ95Lcp2 0DHG+JXDnSJDt4lVjct7HAqa9j/hNY7Kvjyz0c5FQbLcputc5hgrQXbIhWt82g3z9rqTmQ0ac APczeF7iiS9A2TGKsOihbKb8U42HhoQYsKuRUEMccPkDV1PDLTVGHyTc0k4Sdmo8X0ruCMn6c TWtGQ4GqjbVgAlMeTu8kZCaTzFd+Acc3vJheQwHGqU+6k2lgpEtTjzFiREBjR33w0ZqFo67Oq rMGE3YkkUkEbSwzr4V6CQcQAT+ZMSvxzwyRTsfejtnUv4QMF24dKc2Me2sfQUYL41OPxxqt0h i3J1In/Jytn8t47NXDMQ== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean For reusing deleted directory entries we have to adjust the function called to step to the next directory entry. This patch alone is not enough to actually reuse deleted directory entries as the fill_dir_slot() is still called with first never used directory entry. Signed-off-by: Heinrich Schuchardt --- fs/fat/fat_write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.29.2 diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 59cffef34e..0746d73f8d 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -362,7 +362,7 @@ fill_dir_slot(fat_itr *itr, const char *l_name, const char *shortname) flush_dir(itr); /* allocate a cluster for more entries */ - if (!fat_itr_next(itr) && !itr->dent) + if (!next_dent(itr) && !itr->dent) if ((itr->is_root && itr->fsdata->fatsize != 32) || new_dir_table(itr)) return -EIO;