diff options
| author | Paul E. McKenney <paulmck@kernel.org> | 2026-08-14 15:43:51 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2026-08-14 15:43:51 -0700 |
| commit | 9cc63f8bcd560c760d0b12e15bba8f81c86237cf (patch) | |
| tree | 3b5269b1bcf6714171754946367c51e0590f64da /fs/efs/dir.c | |
| download | linux-stable-9cc63f8bcd560c760d0b12e15bba8f81c86237cf.tar.gz linux-stable-9cc63f8bcd560c760d0b12e15bba8f81c86237cf.zip | |
Merge branches 'expcb.2026.07.24a', 'misc.2026.07.30a', 'rcu-tasks.2026.07.30a', 'srcu.2026.08.11a' and 'torture.2026.08.14a' into HEADgrafted
Changes:
Make expedited grace periods expedite normal RCU callbacks
Miscellaneous fixes:
* Improve diagnostic output with character task states.
* Mark accesses to inform KCSAN of concurrency design.
* Move from kmalloc() to kmalloc_obj().
* Documentation updates.
* Improve handling of RCU deferred quiescent states.
* Clean up unused function arguments and structure fields.
* Reduce show_rcu_gp_kthreads() stack space.
Tasks RCU updates:
* Clean up after SRCU re-implementation of Tasks Trace RCU.
* Mark accesses to inform KCSAN of concurrency design.
* Add ->lazy_timer status to diagnostic output.
* Remove an unnecessary memory barrier.
* Fix a data race, courtesy of KCSAN.
* Documentation updates.
* Convert cond_resched_tasks_rcu_qs() from macro to static inline
function.
SRCU updates:
* Add Rust helpers for SRCU.
* Avoid losing queued work at cleanup_srcu_struct() time.
Torture-test updates:
* Preparation work for immediate RCU priority deboosting.
* Test RCU readers from real interrupt handlers (as opposed to softirq).
* Simplify code through use of cpumask_next_wrap().
* Improve diagnostic output with character task states.
* Add rcutorture.nwriters parameter to allow lightweight stall testing,
and rcutorture.stall_only to make doing so easier.
* Test an RCU Tasks Trace grace period implying an RCU grace period.
* Make RCU Tasks Trace torturing track reader batches.
* Fix a data race, courtesy of KCSAN.
* Plug a shuffle_tmp_mask memory leak on kthread spawn failure.
Diffstat (limited to 'fs/efs/dir.c')
| -rw-r--r-- | fs/efs/dir.c | 105 |
1 files changed, 105 insertions, 0 deletions
diff --git a/fs/efs/dir.c b/fs/efs/dir.c new file mode 100644 index 000000000..35ad0092c --- /dev/null +++ b/fs/efs/dir.c @@ -0,0 +1,105 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dir.c + * + * Copyright (c) 1999 Al Smith + */ + +#include <linux/buffer_head.h> +#include <linux/filelock.h> +#include "efs.h" + +static int efs_readdir(struct file *, struct dir_context *); + +const struct file_operations efs_dir_operations = { + .llseek = generic_file_llseek, + .read = generic_read_dir, + .iterate_shared = efs_readdir, + .setlease = generic_setlease, +}; + +const struct inode_operations efs_dir_inode_operations = { + .lookup = efs_lookup, +}; + +static int efs_readdir(struct file *file, struct dir_context *ctx) +{ + struct inode *inode = file_inode(file); + efs_block_t block; + int slot; + + if (inode->i_size & (EFS_DIRBSIZE-1)) + pr_warn("%s(): directory size not a multiple of EFS_DIRBSIZE\n", + __func__); + + /* work out where this entry can be found */ + block = ctx->pos >> EFS_DIRBSIZE_BITS; + + /* each block contains at most 256 slots */ + slot = ctx->pos & 0xff; + + /* look at all blocks */ + while (block < inode->i_blocks) { + struct efs_dir *dirblock; + struct buffer_head *bh; + + /* read the dir block */ + bh = sb_bread(inode->i_sb, efs_bmap(inode, block)); + + if (!bh) { + pr_err("%s(): failed to read dir block %d\n", + __func__, block); + break; + } + + dirblock = (struct efs_dir *) bh->b_data; + + if (be16_to_cpu(dirblock->magic) != EFS_DIRBLK_MAGIC) { + pr_err("%s(): invalid directory block\n", __func__); + brelse(bh); + break; + } + + for (; slot < dirblock->slots; slot++) { + struct efs_dentry *dirslot; + efs_ino_t inodenum; + const char *nameptr; + int namelen; + + if (dirblock->space[slot] == 0) + continue; + + dirslot = (struct efs_dentry *) (((char *) bh->b_data) + EFS_SLOTAT(dirblock, slot)); + + inodenum = be32_to_cpu(dirslot->inode); + namelen = dirslot->namelen; + nameptr = dirslot->name; + pr_debug("%s(): block %d slot %d/%d: inode %u, name \"%s\", namelen %u\n", + __func__, block, slot, dirblock->slots-1, + inodenum, nameptr, namelen); + if (!namelen) + continue; + /* found the next entry */ + ctx->pos = (block << EFS_DIRBSIZE_BITS) | slot; + + /* sanity check */ + if (nameptr - (char *) dirblock + namelen > EFS_DIRBSIZE) { + pr_warn("directory entry %d exceeds directory block\n", + slot); + continue; + } + + /* copy filename and data in dirslot */ + if (!dir_emit(ctx, nameptr, namelen, inodenum, DT_UNKNOWN)) { + brelse(bh); + return 0; + } + } + brelse(bh); + + slot = 0; + block++; + } + ctx->pos = (block << EFS_DIRBSIZE_BITS) | slot; + return 0; +} |
