Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus-5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs
Pull UBIFS and JFFS2 fixes from Richard Weinberger:
"UBIFS:
- Don't block too long in writeback_inodes_sb()
- Fix for a possible overrun of the log head
- Fix double unlock in orphan_delete()
JFFS2:
- Remove C++ style from UAPI header and unbreak picky toolchains"
* tag 'for-linus-5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
ubifs: Limit the number of pages in shrink_liability
ubifs: Correctly initialize c->min_log_bytes
ubifs: Fix double unlock around orphan_delete()
jffs2: Remove C++ style comments from uapi header
+5
-8
+1
-1
fs/ubifs/budget.c
+1
-1
fs/ubifs/budget.c
···
51
51
static void shrink_liability(struct ubifs_info *c, int nr_to_write)
52
52
{
53
53
down_read(&c->vfs_sb->s_umount);
54
-
writeback_inodes_sb(c->vfs_sb, WB_REASON_FS_FREE_SPACE);
54
+
writeback_inodes_sb_nr(c->vfs_sb, nr_to_write, WB_REASON_FS_FREE_SPACE);
55
55
up_read(&c->vfs_sb->s_umount);
56
56
}
57
57
-2
fs/ubifs/orphan.c
-2
fs/ubifs/orphan.c
···
129
129
static void orphan_delete(struct ubifs_info *c, struct ubifs_orphan *orph)
130
130
{
131
131
if (orph->del) {
132
-
spin_unlock(&c->orphan_lock);
133
132
dbg_gen("deleted twice ino %lu", orph->inum);
134
133
return;
135
134
}
···
137
138
orph->del = 1;
138
139
orph->dnext = c->orph_dnext;
139
140
c->orph_dnext = orph;
140
-
spin_unlock(&c->orphan_lock);
141
141
dbg_gen("delete later ino %lu", orph->inum);
142
142
return;
143
143
}
+4
fs/ubifs/super.c
+4
fs/ubifs/super.c
···
609
609
c->max_bu_buf_len = UBIFS_MAX_BULK_READ * UBIFS_MAX_DATA_NODE_SZ;
610
610
if (c->max_bu_buf_len > c->leb_size)
611
611
c->max_bu_buf_len = c->leb_size;
612
+
613
+
/* Log is ready, preserve one LEB for commits. */
614
+
c->min_log_bytes = c->leb_size;
615
+
612
616
return 0;
613
617
}
614
618
-5
include/uapi/linux/jffs2.h
-5
include/uapi/linux/jffs2.h
···
77
77
78
78
#define JFFS2_ACL_VERSION 0x0001
79
79
80
-
// Maybe later...
81
-
//#define JFFS2_NODETYPE_CHECKPOINT (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3)
82
-
//#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4)
83
-
84
-
85
80
#define JFFS2_INO_FLAG_PREREAD 1 /* Do read_inode() for this one at
86
81
mount time, don't wait for it to
87
82
happen later */