Skip to content

Commit 7fde7e8

Browse files
dubeykodubeyko
committed
hfs: rework hfsplus_readdir() logic
The xfstests' test-case generic/637 fails with error: FSTYP -- hfs PLATFORM -- Linux/x86_64 kvm-xfstests 6.15.0-rc4-xfstests-g00b827f0cffa #1 SMP PREEMPT_DYNAMIC Fri May 25 MKFS_OPTIONS -- /dev/vdc MOUNT_OPTIONS -- /dev/vdc /vdc QA output created by 637 entries 7 and 8 have duplicate d_off 8 Found unlinked files in open dir (see xfstests-dev/results//generic/637.full for details) Likewise HFS+, currently, HFS has very complicated and fragile logic of rd->file->f_pos correction in hfs_delete_cat(). This patch removes this logic and it stores the current pos into hfs_readdir_data. Finally, if rd->pos == ctx->pos then hfs_readdir() tries to find the position in b-tree's node by means of hfs_cat_key. This position is used to re-start the folder's content traversal. sudo ./check generic/637 FSTYP -- hfs PLATFORM -- Linux/x86_64 hfsplus-testing-0001 7.1.0-rc1+ #55 SMP PREEMPT_DYNAMIC Tue May 19 15:18:02 PDT 2026 MKFS_OPTIONS -- /dev/loop51 MOUNT_OPTIONS -- /dev/loop51 /mnt/scratch generic/637 32s ... 31s Ran: generic/637 Passed all 1 tests Closes: hfs-linux-kernel#65 cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> cc: Yangtao Li <frank.li@vivo.com> cc: linux-fsdevel@vger.kernel.org Signed-off-by: Viacheslav Dubeyko <slava@dubeyko.com> Link: https://lore.kernel.org/r/20260519222811.1311071-2-slava@dubeyko.com Signed-off-by: Viacheslav Dubeyko <slava@dubeyko.com>
1 parent f14ccd7 commit 7fde7e8

5 files changed

Lines changed: 12 additions & 34 deletions

File tree

‎fs/hfs/catalog.c‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ int hfs_cat_delete(u32 cnid, struct inode *dir, const struct qstr *str)
340340
{
341341
struct super_block *sb;
342342
struct hfs_find_data fd;
343-
struct hfs_readdir_data *rd;
344343
int res, type;
345344

346345
hfs_dbg("name %s, cnid %u\n", str ? str->name : NULL, cnid);
@@ -366,14 +365,6 @@ int hfs_cat_delete(u32 cnid, struct inode *dir, const struct qstr *str)
366365
}
367366
}
368367

369-
/* we only need to take spinlock for exclusion with ->release() */
370-
spin_lock(&HFS_I(dir)->open_dir_lock);
371-
list_for_each_entry(rd, &HFS_I(dir)->open_dir_list, list) {
372-
if (fd.tree->keycmp(fd.search_key, (void *)&rd->key) < 0)
373-
rd->file->f_pos--;
374-
}
375-
spin_unlock(&HFS_I(dir)->open_dir_lock);
376-
377368
res = hfs_brec_remove(&fd);
378369
if (res)
379370
goto out;

‎fs/hfs/dir.c‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,15 @@ static int hfs_readdir(struct file *file, struct dir_context *ctx)
9797
}
9898
if (ctx->pos >= inode->i_size)
9999
goto out;
100-
err = hfs_brec_goto(&fd, ctx->pos - 1);
100+
rd = file->private_data;
101+
if (rd && rd->pos == ctx->pos) {
102+
memcpy(fd.search_key, &rd->key, sizeof(struct hfs_cat_key));
103+
err = hfs_brec_find(&fd);
104+
if (err == -ENOENT)
105+
err = hfs_brec_goto(&fd, 1);
106+
} else {
107+
err = hfs_brec_goto(&fd, ctx->pos - 1);
108+
}
101109
if (err)
102110
goto out;
103111

@@ -146,23 +154,15 @@ static int hfs_readdir(struct file *file, struct dir_context *ctx)
146154
if (err)
147155
goto out;
148156
}
149-
rd = file->private_data;
150157
if (!rd) {
151158
rd = kmalloc_obj(struct hfs_readdir_data);
152159
if (!rd) {
153160
err = -ENOMEM;
154161
goto out;
155162
}
156163
file->private_data = rd;
157-
rd->file = file;
158-
spin_lock(&HFS_I(inode)->open_dir_lock);
159-
list_add(&rd->list, &HFS_I(inode)->open_dir_list);
160-
spin_unlock(&HFS_I(inode)->open_dir_lock);
161164
}
162-
/*
163-
* Can be done after the list insertion; exclusion with
164-
* hfs_delete_cat() is provided by directory lock.
165-
*/
165+
rd->pos = ctx->pos;
166166
memcpy(&rd->key, &fd.key->cat, sizeof(struct hfs_cat_key));
167167
out:
168168
hfs_find_exit(&fd);
@@ -171,13 +171,7 @@ static int hfs_readdir(struct file *file, struct dir_context *ctx)
171171

172172
static int hfs_dir_release(struct inode *inode, struct file *file)
173173
{
174-
struct hfs_readdir_data *rd = file->private_data;
175-
if (rd) {
176-
spin_lock(&HFS_I(inode)->open_dir_lock);
177-
list_del(&rd->list);
178-
spin_unlock(&HFS_I(inode)->open_dir_lock);
179-
kfree(rd);
180-
}
174+
kfree(file->private_data);
181175
return 0;
182176
}
183177

‎fs/hfs/hfs.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
/*======== Data structures kept in memory ========*/
1515

1616
struct hfs_readdir_data {
17-
struct list_head list;
18-
struct file *file;
17+
loff_t pos;
1918
struct hfs_cat_key key;
2019
};
2120

‎fs/hfs/hfs_fs.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ struct hfs_inode_info {
3636

3737
struct hfs_cat_key cat_key;
3838

39-
struct list_head open_dir_list;
40-
spinlock_t open_dir_lock;
4139
struct inode *rsrc_inode;
4240

4341
struct mutex extents_lock;

‎fs/hfs/inode.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@ struct inode *hfs_new_inode(struct inode *dir, const struct qstr *name, umode_t
195195
err = -ERANGE;
196196

197197
mutex_init(&HFS_I(inode)->extents_lock);
198-
INIT_LIST_HEAD(&HFS_I(inode)->open_dir_list);
199-
spin_lock_init(&HFS_I(inode)->open_dir_lock);
200198
hfs_cat_build_key(sb, (btree_key *)&HFS_I(inode)->cat_key, dir->i_ino, name);
201199
next_id = atomic64_inc_return(&HFS_SB(sb)->next_id);
202200
if (next_id > U32_MAX) {
@@ -353,8 +351,6 @@ static int hfs_read_inode(struct inode *inode, void *data)
353351
HFS_I(inode)->flags = 0;
354352
HFS_I(inode)->rsrc_inode = NULL;
355353
mutex_init(&HFS_I(inode)->extents_lock);
356-
INIT_LIST_HEAD(&HFS_I(inode)->open_dir_list);
357-
spin_lock_init(&HFS_I(inode)->open_dir_lock);
358354

359355
/* Initialize the inode */
360356
inode->i_uid = hsb->s_uid;

0 commit comments

Comments
 (0)