diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2024-12-28 12:55:18 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-01 17:21:22 +0100 |
| commit | 0a05521da5147cb1626122ed9d72dea099f63ddd (patch) | |
| tree | 60cfcffb1650722f79ccc07f92422d711721b741 /mm | |
| parent | 3b3b2b47c71683825e5dae74b5bc08ae639199ac (diff) | |
| download | linux-0a05521da5147cb1626122ed9d72dea099f63ddd.tar.gz linux-0a05521da5147cb1626122ed9d72dea099f63ddd.tar.bz2 linux-0a05521da5147cb1626122ed9d72dea099f63ddd.zip | |
Revert "libfs: Add simple_offset_empty()"
commit d7bde4f27ceef3dc6d72010a20d4da23db835a32 upstream.
simple_empty() and simple_offset_empty() perform the same task.
The latter's use as a canary to find bugs has not found any new
issues. A subsequent patch will remove the use of the mtree for
iterating directory contents, so revert back to using a similar
mechanism for determining whether a directory is indeed empty.
Only one such mechanism is ever needed.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Link: https://lore.kernel.org/r/20241228175522.1854234-3-cel@kernel.org
Reviewed-by: Yang Erkun <yangerkun@huawei.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index fdb5afa1cfe9..e10d6e092462 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3821,7 +3821,7 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry) static int shmem_rmdir(struct inode *dir, struct dentry *dentry) { - if (!simple_offset_empty(dentry)) + if (!simple_empty(dentry)) return -ENOTEMPTY; drop_nlink(d_inode(dentry)); @@ -3878,7 +3878,7 @@ static int shmem_rename2(struct mnt_idmap *idmap, return simple_offset_rename_exchange(old_dir, old_dentry, new_dir, new_dentry); - if (!simple_offset_empty(new_dentry)) + if (!simple_empty(new_dentry)) return -ENOTEMPTY; if (flags & RENAME_WHITEOUT) { |