From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 3FD40238C1B for ; Mon, 9 Mar 2026 21:04:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773090262; cv=none; b=ErQgfYnUs+YutrFvqLq2xE/ctk/IbfEvbAsrKlQoyguNV3J7ngiYNlNkyzYb0WKlMXMmw66qqQrFoylMEPfufNS8tHxvlx53q/IpgNi3lLEClQ/Wf72FjBoIKMGpTeE0B2vf8qmOYUikGmT166LtKrIKiIbOwb6kkPiGE161w/M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773090262; c=relaxed/simple; bh=d86YAwDX1aqR7iaQ6tSkcrpUDryQJahIkcqWXrKHR2o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BrlhYmGaKzjpvSIOxMCX84FE7Hfb30iUC62cnl+zYuVy4vKMweMFhNZadpszrMknmM8Dk2hbcNzdOukM0mXBxa2unvkzmDexEiHY1l8R4tORe/3356Fjw8whS03yv/oJrM+gtLBSM7pzfqtNWzifPUDFORHDWjhH9hfTnV9U8Eg= 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=P1Qye9p6; arc=none smtp.client-ip=209.85.221.46 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="P1Qye9p6" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-439ac15f35fso8659038f8f.0 for ; Mon, 09 Mar 2026 14:04:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=versity.com; s=google; t=1773090260; x=1773695060; 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=lr5wF7+Ulxtp7z8CgiAQvz1EZjZjl8gB3e4rD7uxnR0=; b=P1Qye9p6zFrozUDn5uP3vWIlHEo2M7MY5oBkSFtOvRFE0RLvDscLB3mLNE31K5cfJg X/5e/BXUymKxsFL0pt2S3pCJNSf2fzeLFNPtbvh7Ya6d58FIm4DWP8+2y5aTvOWQkstp NSTuMUqCjnzccZ+OTdoWTWQXWyfC/2MgPYEtrNRML6u9a4Zxk6FPwDv7uVXjNqcg4DH/ HkkyhBnX7AoDc3LnxNgg3B/Z/R727+3dca4YJjlD/gAdqfyISKOW58wgVtA8RGriWlyU Z66wivgOF3IDcX00uMuuem8AFk2gvF0ZivgXYIILKHK1er70jiDAMUrEX+uoEfTMl62X 13/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773090260; x=1773695060; 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=lr5wF7+Ulxtp7z8CgiAQvz1EZjZjl8gB3e4rD7uxnR0=; b=Zrt5rKRoW4pW0qjsUuMeumv+r8/SKFDBfByW8TOqzrAy8QFE9Mx5Z8nVW0FflPN6QP wZyAvM9m/d/KFDN93YVS4qfCRaDz9/AmmJqls4+vnt8KbCpsvMRn6pxrjDIkDTlxwbua Ty3isnz80O9vrjkD1AQ/m323/Yc3PHHtKMGv5PVWAm1XIMlzz52jmQblmAZtIJbS2uVZ BPSJ3LbdRRfBW4miPVAnR8pZQHCYF8SPlezxaoDzCRZFrGoQKH0D0DsuQECa6fFGwkHR 7Uursje9JoBmfDe/3KuIoU7VkwM1UWTrQoXC6WbIC0JoRVo4jDrZaKGzewhhp7Z08lLA uPVw== X-Gm-Message-State: AOJu0YyejKUuZq4Xd2HR3rtym93kSoupayNvU4gZ1KaVhVZKzY1FwVLE /Pkmcd41aA1jAL2WItiOo6iha7gL7P0er2iF3nEZH3MLVJgldCAt+gWRC1dK3dLFh0j63Qgs02y j20Ah X-Gm-Gg: ATEYQzzBPY2yeF+p+w327Arpx8Da4BYyY3M410Uv/56hfkQCczYWvYSr5PSPd6brRDw 2s4Rju347VeoZe4ZRRsiBdUT/yPQitjrzygm3yQkd+SDEg5HO7dGXXXFSjTkOP4dKbVImwOOF9K PhSBBTkCWz1As6K0/GsqKncJpYnVDtXZYRVjuQLm927xQBoTeNAsWmKIGR731BKRD5RdRBfsJDP kRQ1xerRFUDjAhDlUkit5V5ha9k8KpmCPgplhpxF5NE/CQhZXldiwBLduQB/HKENHZhzG7yX/oZ wZAV7+haiVoFTDhJVHIqiO+GjQpfDdMsHgi/gXtg2IB1JkUg27CAl2e9Ncp9rVxLisFgsG7W0qf cFdXNNjzeZdJJMEPqbU8/ir+nFmY3bEyDGqLD1VYfSHfxybuQ4iTPl+JkbKqurnY9n4cIMZY4+B n5dQz2oL6M5K36JAIFqJw9BNdi6S0L/ytfzOhvRk2Rt+SJhj4hStjvi8Ql4Cm0tcF5HYs= X-Received: by 2002:a05:600c:4591:b0:480:1e40:3d2 with SMTP id 5b1f17b1804b1-48526979de9mr202947755e9.29.1773090259679; Mon, 09 Mar 2026 14:04:19 -0700 (PDT) Received: from localhost.localdomain (46-117-212-87.ftth.glasoperator.nl. [87.212.117.46]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dada9116sm26906639f8f.14.2026.03.09.14.04.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 14:04:19 -0700 (PDT) From: Valerie Aurora To: rpdfs-devel@lists.linux.dev Cc: Valerie Aurora Subject: [PATCH 3/3] rpdfs: Add rpdfs_unlink and rpdfs_rmdir Date: Mon, 9 Mar 2026 22:04:03 +0100 Message-ID: <20260309210403.105006-4-val@versity.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260309210403.105006-1-val@versity.com> References: <20260309210403.105006-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 Add unlink and rmdir, including checking for an empty directory and splitting out error checking into a proper prepare_unlink() function. Signed-off-by: Valerie Aurora --- fs/rpdfs/dir.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/fs/rpdfs/dir.c b/fs/rpdfs/dir.c index 0de00704a603..7d51c133cba0 100644 --- a/fs/rpdfs/dir.c +++ b/fs/rpdfs/dir.c @@ -503,6 +503,48 @@ static int create_and_instantiate_new(struct mnt_idmap *idmap, struct inode *dir return ret; } +/* + * The VFS did a bunch of checks before calling our unlink + * implementation, but some other node could have made changes between + * then and now. The prepare functions only succeed if the inodes have + * not been freed or reused, the directory entry to be removed is still + * there, and there is no detected corruption (which is distinct from + * changes made by other nodes). + */ +static int prepare_unlink(struct inode *dir, struct inode *inode, struct dentry *dentry) +{ + int ret; + + /* normal failures due to other nodes making changes */ + if (S_ISDIR(inode->i_mode)) { + if (!is_dir_empty(inode)) { + ret = -ENOTEMPTY; + goto out; + } + } + + /* consistency/corruption checks */ + if (S_ISDIR(inode->i_mode)) { + if (inode->i_nlink != 2) { + pr_warn("empty dir ino %lu has bad n_link %d", + inode->i_ino, inode->i_nlink); + ret = -EUCLEAN; + goto out; + } + } else { + if (inode->i_nlink < 1) { + pr_warn("attempting to unlink ino %lu but n_link %d is already < 1", + inode->i_ino, inode->i_nlink); + ret = -EUCLEAN; + goto out; + } + } + + ret = 0; +out: + return ret; +} + static int rpdfs_create(struct mnt_idmap *idmap, struct inode *dir, struct dentry *dentry, umode_t mode, bool excl) { @@ -515,6 +557,62 @@ static struct dentry *rpdfs_mkdir(struct mnt_idmap *idmap, struct inode *dir, return ERR_PTR(create_and_instantiate_new(idmap, dir, dentry, S_IFDIR | mode)); } +static int rpdfs_unlink(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 for 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) ?: + prepare_unlink(dir, inode, dentry); + } 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 link count and metadata change time */ + drop_nlink(inode); + if (S_ISDIR(inode->i_mode)) { + drop_nlink(dir); + drop_nlink(inode); + } + inode_set_ctime_current(inode); + + /* update parent dir size and data/metadata times */ + update_dir_size(dir, -(dentry->d_name.len + 1)); + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); + + /* 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; +} + +static int rpdfs_rmdir(struct inode *dir, struct dentry *dentry) +{ + return rpdfs_unlink(dir, dentry); +} + /* * 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 @@ -714,6 +812,8 @@ const struct inode_operations rpdfs_dir_iops = { .mkdir = rpdfs_mkdir, .rename = rpdfs_rename, .setattr = rpdfs_setattr, + .unlink = rpdfs_unlink, + .rmdir = rpdfs_rmdir, }; const struct file_operations rpdfs_dir_fops = { -- 2.49.0