This pull request contains the following fixes for UBIFS and JFFS2:
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 -----BEGIN PGP SIGNATURE----- iQJKBAABCAA0FiEEdgfidid8lnn52cLTZvlZhesYu8EFAl1ik14WHHJpY2hhcmRA c2lnbWEtc3Rhci5hdAAKCRBm+VmF6xi7wbP2D/4xVW7YP5Yyt6YrABJuclfoib30 2LI6eOz0+5OojQKUbOzXCN9N7Dv4TLJKrCjRc9qKYTIB1DiQXuBDqtYKg6CTBhHb MjiftEDiBQ6j3jVmRxkQRXZEB9I3Uu9CkA8s65+UmL8peJfgNElpH34omsU1fzup y0NhZhj77P5jsAG6r7yXvuaofCOTlZIZVPya9FX17J0Ra+3rMOCtVEqnaHk2E5RB EQPAEByqXUIx7+9mOi1Krw7B7fesB7oOVbCykE5knX1pZQCTURP64yNr35WxN+7Z crcpdEQtf54qWMCKf4ClIBHiPmmsDIHYJy3JXjgJKOwIYvrB3dZ5E170qPr3JixY nS+l8x69IYZhWUzHg8gxDizk92iFYKbO1h5vBwI7NUFHkHLzylsgonBK0KdaUnol OvI5oCO/rdJEMBPr5LEFpOjZJIEptPtXpDvQCpm5tWd5tuW+8edNpI38lDO9LThC O0diZZUQfsuzD1XrvKRORPU+4lskzGV5b1UA0DWXdGKALqM5VrQZo1XftvA74Zkv oZQcHNK5wdecQX81Oadfb/0a5SN7FGGtTUCKTpOyBIu0adarGIasC6TQr2aDiiNh 7jLjBoV2XEGhXZQrK2lm8G+6rJ7Mp11B6aoTFgDELzt+SB7htp6dARR2+4aGWXh9 iXgme0n9HXDDeuosag== =Bsgx -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
94a76d9b52
|
@ -51,7 +51,7 @@
|
||||||
static void shrink_liability(struct ubifs_info *c, int nr_to_write)
|
static void shrink_liability(struct ubifs_info *c, int nr_to_write)
|
||||||
{
|
{
|
||||||
down_read(&c->vfs_sb->s_umount);
|
down_read(&c->vfs_sb->s_umount);
|
||||||
writeback_inodes_sb(c->vfs_sb, WB_REASON_FS_FREE_SPACE);
|
writeback_inodes_sb_nr(c->vfs_sb, nr_to_write, WB_REASON_FS_FREE_SPACE);
|
||||||
up_read(&c->vfs_sb->s_umount);
|
up_read(&c->vfs_sb->s_umount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,6 @@ static void __orphan_drop(struct ubifs_info *c, struct ubifs_orphan *o)
|
||||||
static void orphan_delete(struct ubifs_info *c, struct ubifs_orphan *orph)
|
static void orphan_delete(struct ubifs_info *c, struct ubifs_orphan *orph)
|
||||||
{
|
{
|
||||||
if (orph->del) {
|
if (orph->del) {
|
||||||
spin_unlock(&c->orphan_lock);
|
|
||||||
dbg_gen("deleted twice ino %lu", orph->inum);
|
dbg_gen("deleted twice ino %lu", orph->inum);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -138,7 +137,6 @@ static void orphan_delete(struct ubifs_info *c, struct ubifs_orphan *orph)
|
||||||
orph->del = 1;
|
orph->del = 1;
|
||||||
orph->dnext = c->orph_dnext;
|
orph->dnext = c->orph_dnext;
|
||||||
c->orph_dnext = orph;
|
c->orph_dnext = orph;
|
||||||
spin_unlock(&c->orphan_lock);
|
|
||||||
dbg_gen("delete later ino %lu", orph->inum);
|
dbg_gen("delete later ino %lu", orph->inum);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -609,6 +609,10 @@ static int init_constants_early(struct ubifs_info *c)
|
||||||
c->max_bu_buf_len = UBIFS_MAX_BULK_READ * UBIFS_MAX_DATA_NODE_SZ;
|
c->max_bu_buf_len = UBIFS_MAX_BULK_READ * UBIFS_MAX_DATA_NODE_SZ;
|
||||||
if (c->max_bu_buf_len > c->leb_size)
|
if (c->max_bu_buf_len > c->leb_size)
|
||||||
c->max_bu_buf_len = c->leb_size;
|
c->max_bu_buf_len = c->leb_size;
|
||||||
|
|
||||||
|
/* Log is ready, preserve one LEB for commits. */
|
||||||
|
c->min_log_bytes = c->leb_size;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -77,11 +77,6 @@
|
||||||
|
|
||||||
#define JFFS2_ACL_VERSION 0x0001
|
#define JFFS2_ACL_VERSION 0x0001
|
||||||
|
|
||||||
// Maybe later...
|
|
||||||
//#define JFFS2_NODETYPE_CHECKPOINT (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3)
|
|
||||||
//#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4)
|
|
||||||
|
|
||||||
|
|
||||||
#define JFFS2_INO_FLAG_PREREAD 1 /* Do read_inode() for this one at
|
#define JFFS2_INO_FLAG_PREREAD 1 /* Do read_inode() for this one at
|
||||||
mount time, don't wait for it to
|
mount time, don't wait for it to
|
||||||
happen later */
|
happen later */
|
||||||
|
|
Loading…
Reference in New Issue