Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+13
-4
+3
-1
fs/jffs2/erase.c
+3
-1
fs/jffs2/erase.c
···
425
425
.totlen = cpu_to_je32(c->cleanmarker_size)
426
426
};
427
427
428
-
jffs2_prealloc_raw_node_refs(c, jeb, 1);
428
+
ret = jffs2_prealloc_raw_node_refs(c, jeb, 1);
429
+
if (ret)
430
+
goto filebad;
429
431
430
432
marker.hdr_crc = cpu_to_je32(crc32(0, &marker, sizeof(struct jffs2_unknown_node)-4));
431
433
+3
-1
fs/jffs2/scan.c
+3
-1
fs/jffs2/scan.c
···
256
256
257
257
jffs2_dbg(1, "%s(): Skipping %d bytes in nextblock to ensure page alignment\n",
258
258
__func__, skip);
259
-
jffs2_prealloc_raw_node_refs(c, c->nextblock, 1);
259
+
ret = jffs2_prealloc_raw_node_refs(c, c->nextblock, 1);
260
+
if (ret)
261
+
goto out;
260
262
jffs2_scan_dirty_space(c, c->nextblock, skip);
261
263
}
262
264
#endif
+6
-1
fs/jffs2/summary.c
+6
-1
fs/jffs2/summary.c
···
858
858
spin_unlock(&c->erase_completion_lock);
859
859
860
860
jeb = c->nextblock;
861
-
jffs2_prealloc_raw_node_refs(c, jeb, 1);
861
+
ret = jffs2_prealloc_raw_node_refs(c, jeb, 1);
862
+
863
+
if (ret)
864
+
goto out;
862
865
863
866
if (!c->summary->sum_num || !c->summary->sum_list_head) {
864
867
JFFS2_WARNING("Empty summary info!!!\n");
···
875
872
datasize += padsize;
876
873
877
874
ret = jffs2_sum_write_data(c, jeb, infosize, datasize, padsize);
875
+
876
+
out:
878
877
spin_lock(&c->erase_completion_lock);
879
878
return ret;
880
879
}
+1
-1
fs/ubifs/journal.c
+1
-1
fs/ubifs/journal.c
···
985
985
dbg_jnl("ino %lu, nlink %u", inode->i_ino, inode->i_nlink);
986
986
987
987
if (kill_xattrs && ui->xattr_cnt > ubifs_xattr_max_cnt(c)) {
988
-
ubifs_err(c, "Cannot delete inode, it has too much xattrs!");
988
+
ubifs_err(c, "Cannot delete inode, it has too many xattrs!");
989
989
err = -EPERM;
990
990
ubifs_ro_mode(c, err);
991
991
return err;