diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-25 11:29:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-25 11:29:27 -0700 |
| commit | 94a76d9b525c2dd81af2a98e26fe01f99b20727d (patch) | |
| tree | 46f7842e52255f80b8cb711980349d4853be72aa /include | |
| parent | 146c3d3220e039b5d61bf810e0b42218eb020f39 (diff) | |
| parent | 0af83abbd4a6e36a4b209d8c57c26143e40eeec1 (diff) | |
| download | linux-94a76d9b525c2dd81af2a98e26fe01f99b20727d.tar.bz2 | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/jffs2.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/uapi/linux/jffs2.h b/include/uapi/linux/jffs2.h index a18b719f49d4..784ba0b9690a 100644 --- a/include/uapi/linux/jffs2.h +++ b/include/uapi/linux/jffs2.h @@ -77,11 +77,6 @@ #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 mount time, don't wait for it to happen later */ |