diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-07 07:24:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-07 07:24:07 -0700 |
| commit | 5b032cac622533631b8f9b7826498b7ce75001c6 (patch) | |
| tree | d24d8d33fcba5df0099da66ba458f661a6342e4d /fs/ubifs | |
| parent | Merge tag 'mm-stable-2025-06-06-16-09' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | jffs2: check jffs2_prealloc_raw_node_refs() result in few other places (diff) | |
| download | linux-5b032cac622533631b8f9b7826498b7ce75001c6.tar.gz linux-5b032cac622533631b8f9b7826498b7ce75001c6.zip | |
Merge tag 'ubifs-for-linus-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs
Pull JFFS2 and UBIFS fixes from Richard Weinberger:
"JFFS2:
- Correctly check return code of jffs2_prealloc_raw_node_refs()
UBIFS:
- Spelling fixes"
* tag 'ubifs-for-linus-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
jffs2: check jffs2_prealloc_raw_node_refs() result in few other places
jffs2: check that raw node were preallocated before writing summary
ubifs: Fix grammar in error message
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/journal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index ee954e64ce7f..e28ab4395e5c 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -985,7 +985,7 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode) dbg_jnl("ino %lu, nlink %u", inode->i_ino, inode->i_nlink); if (kill_xattrs && ui->xattr_cnt > ubifs_xattr_max_cnt(c)) { - ubifs_err(c, "Cannot delete inode, it has too much xattrs!"); + ubifs_err(c, "Cannot delete inode, it has too many xattrs!"); err = -EPERM; ubifs_ro_mode(c, err); return err; |