From patchwork Thu Feb 22 20:30:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 205039 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp193603dyb; Thu, 22 Feb 2024 12:31:00 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWy6wME28PxbAIstcn6vA9Tv84i4JBCpMwXZ/Sucw7cybepnatw8ipDAIaBqjOTEDnVpmMeVr32D0hcXJwMdm/wk/OkvA== X-Google-Smtp-Source: AGHT+IGfewER4XyA6Ge3Ry5Vrx/Hb2/kaNWHD09Vab0G/ooZ6UAhAHM8I2Qtvhk9TsdqhQ/Yp4oU X-Received: by 2002:a1f:e043:0:b0:4c9:98f8:83ce with SMTP id x64-20020a1fe043000000b004c998f883cemr125854vkg.6.1708633860417; Thu, 22 Feb 2024 12:31:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708633860; cv=pass; d=google.com; s=arc-20160816; b=0ZKsMNvndvbW+N1CaNWtTcsKNaDdT1sS8icLVLbtC8Up94EmEqoOji1RYOamTBFgin KwSQlFUnYlXpUqC6kxz4x2wqENdezr//CxOWSN2reCjQAipfh32X0nWSitHZARHMWiNu FrQZrtt1QbqaGasvb9V0bjkCL3Y+fh5YQNG+oi2WSPsIaR2p5vd4mOL5a8Igw7ynF5Qk OSdGCofXDkOfWTl/IhEZWkp87CpzlLjWlgqc0qBAMYbnNd3m1ynfvYw8NB+LmADqf+7L XVziQ0junclMVdd10LeKjoMKW5Fv5P3kS8kM7oIs6nd1SMCStFVqNEn2NWher8kI5ygB ZvFg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=uDD88zaVrMvSV7jyXIjccldv2PnZ3aOybLZ9ITuOEPM=; fh=M1BFU8D0M2wMFJadttQKyYzLyw/x/ilOfFHLuf+olwQ=; b=tYgFHDrDCHsxBEeQZC1YuvQ8NUDkvL3P/5vUmjylKXDc7p89dFwhGt7Deh7bltY8TZ Jl+8n3oKzdA62sb76rCL6gWA+UcJr6UByscRe2wMsqMcyvOQNFALftBX9pqlVSudHRjw CXpmnZqYMmcP2DZycWUd54GF1WU1U1z7+KZq7zEi1eSyWe/WTXJz3UkchMutZ9msJacB XNM52599ii3/X20+7KxJJMRoRGhFFGPiZYezFeCQZTJW0dVVzuPmRM3+NmbgFTQH7n/a 2/yceJ1K6bgqZKr1m1CLgnrT+wkvzUO+dSmW4aA5sUdpM9kx0fmtzTLTNfZ6iFCg1O5p EbGg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=JGZc1gqk; arc=pass (i=1 spf=pass spfdomain=igalia.com dkim=pass dkdomain=igalia.com); spf=pass (google.com: domain of linux-kernel+bounces-77319-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-77319-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id n187-20020a1fd6c4000000b004c01a32f9e0si2259980vkg.22.2024.02.22.12.31.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 12:31:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-77319-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=JGZc1gqk; arc=pass (i=1 spf=pass spfdomain=igalia.com dkim=pass dkdomain=igalia.com); spf=pass (google.com: domain of linux-kernel+bounces-77319-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-77319-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id EB0B31C20DC4 for ; Thu, 22 Feb 2024 20:30:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B567E7175F; Thu, 22 Feb 2024 20:30:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b="JGZc1gqk" Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F325C29CEA; Thu, 22 Feb 2024 20:30:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.97.179.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708633843; cv=none; b=XTV5ZlyFKumEBfyILuZbHIPMMMc51vcPETUmQzOd3Waz9Qks+x4Q8MUsnDVuUbUL/LaQSJV/DLRVt0YaF4qeJfr8tz8yw/wPhbrzL9kXm4ZsimAIkOBe/NLRLiZ9ZaAW5qQOJwGGDknNV7n2fFHw+0+HPBLSLEok1XZ6mK8TG2I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708633843; c=relaxed/simple; bh=PGw/6elJRjzjT5oami1yJD74wKwg8urvYRLz170UPWU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=a0gMP9lMZvuMcpFVCY6yzKw8SuTGC80XtmjIlCuWbBs7LzpMGoAtdxoI5gwFy5tRTNBAfFC/rTRtGnrgHFNwUOOrrvAGklvO0J96m5z4slSmOujeA7rlWktXYdEBLAFfErSUoPcdbyUwRlPiqCqnU/+vYr5Wjen8sEZe3dH8YEE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=igalia.com; spf=pass smtp.mailfrom=igalia.com; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b=JGZc1gqk; arc=none smtp.client-ip=213.97.179.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=igalia.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=igalia.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=uDD88zaVrMvSV7jyXIjccldv2PnZ3aOybLZ9ITuOEPM=; b=JGZc1gqkZdMeL5Y4Bsdn/FPyaq DFOTfRXZTGmrEQmBgQ5yBj0Dbf9dCT8o6LG1NZ7WjVclxxUFMHtPouewiUtOBODiJaaefLnY6LK74 wVx+P36s6ULKZM2OqnQX2+63eY3fP4Sda0nDOHVqFGm6/hTL2xwheMFdsp9jSvVN3jeqtddSS9kdS wdG7m+AgLId0wB3PGptDb5agHuynLsV9VSrPbxGJIp9pvk7TCbjMGCzM4zx4z6rfRAla3N6mFFSn3 OSSUPSWcdYyrEPhPB8qnL+l75+Sbcc26ihMXCNfye6Uyh3b391GsEFcx9TNbnV8zAQL5/a+U1wovK zRamh19Q==; Received: from 179-125-75-196-dinamico.pombonet.net.br ([179.125.75.196] helo=quatroqueijos.lan) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1rdFi4-002SRK-9F; Thu, 22 Feb 2024 21:30:24 +0100 From: Thadeu Lima de Souza Cascardo To: OGAWA Hirofumi Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Gwendal Grignou , dlunev@chromium.org, Thadeu Lima de Souza Cascardo Subject: [PATCH] fat: ignore .. subdir and always add a link to dirs Date: Thu, 22 Feb 2024 17:30:13 -0300 Message-Id: <20240222203013.2649457-1-cascardo@igalia.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791632458876537937 X-GMAIL-MSGID: 1791632458876537937 The tools used for creating images for the Lego Mindstrom EV3 are not adding '.' and '..' entry in the 'Projects' directory. Without this fix, the kernel can not fill the inode structure for 'Projects' directory. See https://github.com/microsoft/pxt-ev3/issues/980 And https://github.com/microsoft/uf2-linux/issues/6 When counting the number of subdirs, ignore .. subdir and add one when setting the initial link count for directories. This way, when .. is present, it is still accounted for, and when neither . or .. are present, a single link is still done, as it should, since this link would be the one from the parent directory. With this fix applied, we can mount an image with such empty directories, access them, create subdirectories and remove them. Signed-off-by: Thadeu Lima de Souza Cascardo Cc: Gwendal Grignou Link: https://lore.kernel.org/all/20220204062232.3410036-1-gwendal@chromium.org/ Cc: dlunev@chromium.org --- fs/fat/dir.c | 3 ++- fs/fat/inode.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/fs/fat/dir.c b/fs/fat/dir.c index 00235b8a1823..fcdb652efc53 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c @@ -937,7 +937,8 @@ int fat_subdirs(struct inode *dir) bh = NULL; cpos = 0; while (fat_get_short_entry(dir, &cpos, &bh, &de) >= 0) { - if (de->attr & ATTR_DIR) + if (de->attr & ATTR_DIR && + strncmp(de->name, MSDOS_DOTDOT, MSDOS_NAME)) count++; } brelse(bh); diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 1fac3dabf130..9a3bd38a4494 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -494,8 +494,14 @@ static int fat_validate_dir(struct inode *dir) { struct super_block *sb = dir->i_sb; - if (dir->i_nlink < 2) { - /* Directory should have "."/".." entries at least. */ + if (dir->i_nlink < 1) { + /* + * Though it is expected that directories have at least + * "."/".." entries, there are filesystems in the field that + * don't have either. Even in those cases, at least one link + * is necessary, as otherwise, when trying to increment it, + * VFS would BUG. + */ fat_fs_error(sb, "corrupted directory (invalid entries)"); return -EIO; } @@ -534,7 +540,7 @@ int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) return error; MSDOS_I(inode)->mmu_private = inode->i_size; - set_nlink(inode, fat_subdirs(inode)); + set_nlink(inode, fat_subdirs(inode) + 1); error = fat_validate_dir(inode); if (error < 0)