diff options
| author | Linus Torvalds | 2016-01-13 03:20:20 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2016-01-13 03:20:20 +0100 |
| commit | 60b7eca1dc2ec066916b3b7ac6ad89bea13cb9af (patch) | |
| tree | e95a890586b5d8113de5d1516a8b73add32876b0 /fs/ubifs/key.h | |
| parent | Merge tag 'configfs-for-linus' of git://git.infradead.org/users/hch/configfs (diff) | |
| parent | ubifs: Use XATTR_*_PREFIX_LEN (diff) | |
| download | kernel-qcow2-linux-60b7eca1dc2ec066916b3b7ac6ad89bea13cb9af.tar.gz kernel-qcow2-linux-60b7eca1dc2ec066916b3b7ac6ad89bea13cb9af.tar.xz kernel-qcow2-linux-60b7eca1dc2ec066916b3b7ac6ad89bea13cb9af.zip | |
Merge tag 'upstream-4.5-rc1' of git://git.infradead.org/linux-ubifs
Pull UBI/UBIFS updates from Richard Weinberger:
"This contains three changes - two cleanups and one UBI wear leveling
improvement by Sebastian Siewior"
* tag 'upstream-4.5-rc1' of git://git.infradead.org/linux-ubifs:
ubifs: Use XATTR_*_PREFIX_LEN
UBIFS: add a comment in key.h for unused parameter
mtd: ubi: wl: avoid erasing a PEB which is empty
Diffstat (limited to 'fs/ubifs/key.h')
| -rw-r--r-- | fs/ubifs/key.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h index 92a8491a8f8c..c0a95e393347 100644 --- a/fs/ubifs/key.h +++ b/fs/ubifs/key.h @@ -34,6 +34,12 @@ * node. We use "r5" hash borrowed from reiserfs. */ +/* + * Lot's of the key helpers require a struct ubifs_info *c as the first parameter. + * But we are not using it at all currently. That's designed for future extensions of + * different c->key_format. But right now, there is only one key type, UBIFS_SIMPLE_KEY_FMT. + */ + #ifndef __UBIFS_KEY_H__ #define __UBIFS_KEY_H__ |