From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A960A3A8FF1 for ; Tue, 24 Feb 2026 16:42:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771951337; cv=none; b=ioMSs1W5Rd5+CPUeaKOdbHv1+yH8JOz5g2eH3bWbisZRWy4qaCHY54jOlqBdM+XUvDP1dg7c+ylyEhI2hEj2UsZOMnROqbiFMpCWDnKVOkVmF5jehMVJuZuzmfJBYmg0vQiwPy90Y4gT3BHCLiIeoN8N22zjod7Toftv+l804HE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771951337; c=relaxed/simple; bh=wb7jf8xgiwniiFeFpqb86MR1sGOUjxfZ7BJoyZB7b+I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fh9DupS4tfpM9lFGkSpHVnogphTBhzzc43kDavVKRbyX9bnlDK/qm9+nJSP9yJpgDHPhPgpj0Hh2OxsWLvTF48e4Wyp81U2xqUky4NXlW1d4iwoni1Rkw15ZQB9O5u7nQVJTu9zgSB11A/GQr729XVryvL6FLR5pLPWD2rut1Os= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=permerror header.from=versity.com; spf=pass smtp.mailfrom=versity.com; dkim=pass (2048-bit key) header.d=versity.com header.i=@versity.com header.b=jXrIS9Nw; arc=none smtp.client-ip=209.85.208.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=permerror header.from=versity.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=versity.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=versity.com header.i=@versity.com header.b="jXrIS9Nw" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-65f5bd5c8e3so1442685a12.1 for ; Tue, 24 Feb 2026 08:42:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=versity.com; s=google; t=1771951334; x=1772556134; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pczcJh3gzR9m8Ya6iah06rCzmjmao9PGshYh7b9I7PA=; b=jXrIS9NwJxd6neYQUiquCoD2ptjrBplJt00mmK1x34zLVSzeDa2h9JuOVo5AD+rO6v VMheAIRXZOsk4fpYZBhdYaBsAH+apYB9JMXg7kyEv1PcQQXgQ2jjNtqHk96qwYZbCsoA 2VMBPFFwGfIoY9iOeXGkpTRMlJ06vXObxOxWH7/J0xDkPctxExfFQ9MF63xW+AvYioqE 6ndxaVgHvx3LGULyat3XvXQRUwKckMO7AniNtAZsCblmj1x0Z+zKlt0LQEgUJ0xHiRC9 gaOrMmwBuSoU/35/WkrJfnNUQCcZ2tv8N5QD7rzRkZKIXBUcmpwkNQ1+1UaiB1eoneqM 47sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771951334; x=1772556134; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=pczcJh3gzR9m8Ya6iah06rCzmjmao9PGshYh7b9I7PA=; b=qwd4M/K5zaota3ZA9JgdGIKaeuYH6FvWYdvPLwyO96oSEv7z0FwBGeXw6SgSl9Z/MK zqNo2vJAVc9R2c5NkQ2ta8XtT+5m1T5JTpCGe34u72Baga6vQGeW221MqwVuwUL8w4su c5Rab5Qz1CTTmojdNHSXKr54zAP2Lw7+umpLXZ9emKQbOCvpJgEJWbbB7j1bIk26d9Df ZnZZRBdDPn5J4+povp2MeK75twIOol8Qa7vSy82jf8JSH1N/CUN8ik68VEyiZLhbsJ60 +bzzfszQ2J+mu/tcE8eCBf+3lnGfGrveG6Dn8Vz6X2qLsOlZ/iaA22pZ+jzR3sWsWdEe ZSPw== X-Gm-Message-State: AOJu0YxtNAUVoqTs544glvM+haAm5WGTq9v6lMS83LckxuJ/1oiwl1VL O1tic0kv8XHMfPHVB474nznYfFRaAwggohxaA/bc9aSSvNwTAt2wgQAgaght5McDJTtiL/PyTmR tP6KnGts= X-Gm-Gg: ATEYQzycSPuLcFknMorMupN0yAuwjJaEHJndIteiiLaSF6VkKWVtzwfeVyVkc0O/NN6 DHlCEBtkKAuzyrXkufr39DKqCDYAyr6fxqwuH/UZvGXkIvxExaTFMTWgUZSmASewLUx+4yEipYN CgLyPNAJOZC+vSPR7Jg+NOchvy1NkAn1VcjrT5bvo/8cigZx+nyRSAlJN/6rSTAu/Qcb0NJk5MQ NAomB77jek9sddgyzsjh8v87dsRtlAK24yVVBsAzht548oMSKF4MPDsO4KzsX1oyxL0y6nhtKqu loRB/EQg1A+0O3+LTQ+H1TfGVgYqq6xXTVDzgvrDIRcaX7ZhG3yBvI+smT44DA6lywLL3pJfz/6 yTaRUKu2VQTr1FD8FSOS+YfYEy2IBxFxwsEfFSGV4jVJ+H8R4KIhx1H6qXZ7Jm3+tzYxXM3FSzI G6U8s5vfeVw5meI/lO29L07VienrX6TOlXkAVq/H86RZCtGELd/jYH6SrpIsunHFTdrIs= X-Received: by 2002:a05:6402:5112:b0:65c:3c43:d9c4 with SMTP id 4fb4d7f45d1cf-65ea4ee7c32mr7776235a12.10.1771951333700; Tue, 24 Feb 2026 08:42:13 -0800 (PST) Received: from localhost.localdomain (46-117-212-87.ftth.glasoperator.nl. [87.212.117.46]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65eaba13866sm3462367a12.18.2026.02.24.08.42.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Feb 2026 08:42:13 -0800 (PST) From: Valerie Aurora To: rpdfs-devel@lists.linux.dev Cc: Valerie Aurora Subject: [PATCH 2/2] Add rpdfs_rmdir() Date: Tue, 24 Feb 2026 17:41:57 +0100 Message-ID: <20260224164157.2591-3-val@versity.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260224164157.2591-1-val@versity.com> References: <20260224164157.2591-1-val@versity.com> Precedence: bulk X-Mailing-List: rpdfs-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Copied from rpdfs_rename() and the extra bits removed. Signed-off-by: Valerie Aurora --- fs/rpdfs/dir.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/fs/rpdfs/dir.c b/fs/rpdfs/dir.c index 9b33453ad5f6..cff995a7618c 100644 --- a/fs/rpdfs/dir.c +++ b/fs/rpdfs/dir.c @@ -541,6 +541,56 @@ static int rpdfs_unlink(struct inode *dir, struct dentry *dentry) return ret; } +static int rpdfs_rmdir(struct inode *dir, struct dentry *dentry) +{ + struct rpdfs_fs_info *rfi = RPDFS_INODE_FS(dir); + struct inode *inode = d_inode(dentry); + struct key_dent *kd = NULL; + DECLARE_RPDFS_TXN(txn); + int ret; + + kd = alloc_key_dent(dentry, inode); + if (!kd) { + ret = -ENOMEM; + goto out; + } + + /* prepare all the blocks in the txn */ + do { + ret = rpdfs_inode_txn_prepare(rfi, &txn, dir, RBAF_WRITE) ?: + rpdfs_inode_txn_prepare(rfi, &txn, inode, RBAF_WRITE) ?: + prepare_remove_entry(rfi, &txn, dir, kd); + } while (rpdfs_txn_retry(rfi, &txn, &ret)); + if (ret < 0) + goto out; + + /* apply changes to block structures */ + apply_remove_entry(rfi, &txn, dir, kd); + + /* update vfs inodes: first dir sizes and times */ + i_size_write(dir, i_size_read(dir) - dentry->d_name.len); + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); + + /* now inode nlink and times */ + if (inode->i_nlink < 2) + pr_warn("deleting dir %.*s with link count %d < 2", + dentry->d_name.len, dentry->d_name.name, inode->i_nlink); + else + clear_nlink(inode); + inode_set_ctime_current(inode); + + /* update block storage of vfs inodes */ + rpdfs_inode_txn_update(rfi, &txn, dir); + rpdfs_inode_txn_update(rfi, &txn, inode); + + ret = 0; +out: + rpdfs_txn_reset(rfi, &txn); + kfree(kd); + + return ret; +} + /* * The vfs has verified the cached directories. Our inode refresh will * fail if the inodes have been reused, so we don't have to test if @@ -731,6 +781,7 @@ const struct inode_operations rpdfs_dir_iops = { .mkdir = rpdfs_mkdir, .rename = rpdfs_rename, .unlink = rpdfs_unlink, + .rmdir = rpdfs_rmdir, }; const struct file_operations rpdfs_dir_fops = { -- 2.49.0