From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) (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 31EF51DE2BB for ; Thu, 17 Oct 2024 17:19:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.60.130.6 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729185599; cv=none; b=lKsd0BREaYg9t1o5IncmMcQLnu/0n2+WrG3wXHkUPQXdw/ORMRyAJ9cXBUzvxKZakspGLQ9ucgqhS8UhnG/RPe0FwF7BG8XXMzODlkd3x7g0bRKsELLdhdJhabFStFBRjDIgJRxwui+cXCLQgNhkaf8x85spa65yKNLn+lqdM9k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729185599; c=relaxed/simple; bh=MqNfKNe32pTG9Ghu7TWZ7xouR2PzQLyYDFZIIV/kP/Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=u4HoJKMx457jh3W3C/fwupGWwb6+0ITFpmnk6yRKD6d1o3yNMQeIhswJDkdBQYZX/XbyG5JVkf2i9AWpE+vuQCd7s/TRElOuU3Nuz9lIoH46WKliEioMfjTMUP97GIL76hK0WuLZ1Hgr6tCGEP6nqcO/ncLmgwkzjQSpnbZPlD8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (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=pofrwsc3; arc=none smtp.client-ip=178.60.130.6 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=igalia.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=igalia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b="pofrwsc3" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: 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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=jv5yqAyzLEosV0fAsIZrMYvs9OxahZYp+JHgnt+CO6c=; b=pofrwsc3KMtgBH5xfpjdOCDGFI w3YizkYFGepOiUhuk39aXcKuM2emm99O+e4dXdtadQqE7cqIBzOEN2crhpIVK8h2fmP6bUbQglsSp FlDMc5KSUSfC4yJnWWFHFceqt9xqS7/B3OQK6GuAiZNjAHK+fIoBbwrjLahhd8mt1G/GO8bQ6bJ7L KQwa8oql1ekSYj2l8TaOPfo/R6tx5QjTajo2nf+1a1a8G5L8vDQ8wdDZ8z7U5ywHNnMMlKwfLfaWp 6KBWncptTIlQjAe5NbHM/UhfLA12t7B8JOMrygIty9YVSwflTC0CgG8pRl8r121s8NghQAWH56eg3 B20isAwA==; Received: from 179-125-64-237-dinamico.pombonet.net.br ([179.125.64.237] helo=quatroqueijos.lan) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1t1UAB-00Biqr-RW; Thu, 17 Oct 2024 19:19:52 +0200 From: Thadeu Lima de Souza Cascardo To: stable@vger.kernel.org Cc: Jan Kara , kernel-dev@igalia.com, Thadeu Lima de Souza Cascardo Subject: [PATCH 6.1 11/19] udf: Convert udf_rmdir() to new directory iteration code Date: Thu, 17 Oct 2024 14:19:07 -0300 Message-Id: <20241017171915.311132-12-cascardo@igalia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241017171915.311132-1-cascardo@igalia.com> References: <20241017171915.311132-1-cascardo@igalia.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jan Kara [ Upstream commit d11ffa8d3ec11fdb665f12f95d58d74673051a93 ] Convert udf_rmdir() to use new directory iteration code. Signed-off-by: Jan Kara Signed-off-by: Thadeu Lima de Souza Cascardo --- fs/udf/namei.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/fs/udf/namei.c b/fs/udf/namei.c index 187036249a96..42780b5386ca 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c @@ -898,30 +898,23 @@ static int empty_dir(struct inode *dir) static int udf_rmdir(struct inode *dir, struct dentry *dentry) { - int retval; + int ret; struct inode *inode = d_inode(dentry); - struct udf_fileident_bh fibh; - struct fileIdentDesc *fi, cfi; + struct udf_fileident_iter iter; struct kernel_lb_addr tloc; - retval = -ENOENT; - fi = udf_find_entry(dir, &dentry->d_name, &fibh, &cfi); - if (IS_ERR_OR_NULL(fi)) { - if (fi) - retval = PTR_ERR(fi); + ret = udf_fiiter_find_entry(dir, &dentry->d_name, &iter); + if (ret) goto out; - } - retval = -EIO; - tloc = lelb_to_cpu(cfi.icb.extLocation); + ret = -EFSCORRUPTED; + tloc = lelb_to_cpu(iter.fi.icb.extLocation); if (udf_get_lb_pblock(dir->i_sb, &tloc, 0) != inode->i_ino) goto end_rmdir; - retval = -ENOTEMPTY; + ret = -ENOTEMPTY; if (!empty_dir(inode)) goto end_rmdir; - retval = udf_delete_entry(dir, fi, &fibh, &cfi); - if (retval) - goto end_rmdir; + udf_fiiter_delete_entry(&iter); if (inode->i_nlink != 2) udf_warn(inode->i_sb, "empty directory has nlink != 2 (%u)\n", inode->i_nlink); @@ -931,14 +924,11 @@ static int udf_rmdir(struct inode *dir, struct dentry *dentry) inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode); mark_inode_dirty(dir); - + ret = 0; end_rmdir: - if (fibh.sbh != fibh.ebh) - brelse(fibh.ebh); - brelse(fibh.sbh); - + udf_fiiter_release(&iter); out: - return retval; + return ret; } static int udf_unlink(struct inode *dir, struct dentry *dentry) -- 2.34.1