Skip to content

[pull] master from torvalds:master #2968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Jun 7, 2025
Merged

[pull] master from torvalds:master #2968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73e9bb4
ubifs: Fix grammar in error message
toblux Apr 22, 2025
ec9e6f2
jffs2: check that raw node were preallocated before writing summary
Mar 7, 2025
2b6d965
jffs2: check jffs2_prealloc_raw_node_refs() result in few other places
pchelkin91 Mar 25, 2025
5b032ca
Merge tag 'ubifs-for-linus-6.16-rc1' of git://git.kernel.org/pub/scm/…
torvalds Jun 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion fs/jffs2/erase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,9 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
.totlen = cpu_to_je32(c->cleanmarker_size)
};

jffs2_prealloc_raw_node_refs(c, jeb, 1);
ret = jffs2_prealloc_raw_node_refs(c, jeb, 1);
if (ret)
goto filebad;

marker.hdr_crc = cpu_to_je32(crc32(0, &marker, sizeof(struct jffs2_unknown_node)-4));

Expand Down
4 changes: 3 additions & 1 deletion fs/jffs2/scan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,9 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)

jffs2_dbg(1, "%s(): Skipping %d bytes in nextblock to ensure page alignment\n",
__func__, skip);
jffs2_prealloc_raw_node_refs(c, c->nextblock, 1);
ret = jffs2_prealloc_raw_node_refs(c, c->nextblock, 1);
if (ret)
goto out;
jffs2_scan_dirty_space(c, c->nextblock, skip);
}
#endif
Expand Down
7 changes: 6 additions & 1 deletion fs/jffs2/summary.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,10 @@ int jffs2_sum_write_sumnode(struct jffs2_sb_info *c)
spin_unlock(&c->erase_completion_lock);

jeb = c->nextblock;
jffs2_prealloc_raw_node_refs(c, jeb, 1);
ret = jffs2_prealloc_raw_node_refs(c, jeb, 1);

if (ret)
goto out;

if (!c->summary->sum_num || !c->summary->sum_list_head) {
JFFS2_WARNING("Empty summary info!!!\n");
Expand All @@ -872,6 +875,8 @@ int jffs2_sum_write_sumnode(struct jffs2_sb_info *c)
datasize += padsize;

ret = jffs2_sum_write_data(c, jeb, infosize, datasize, padsize);

out:
spin_lock(&c->erase_completion_lock);
return ret;
}
2 changes: 1 addition & 1 deletion fs/ubifs/journal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down