diff options
-rw-r--r-- | fs/ubifs/key.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h index 5fa27ea031ba..919af84b9e17 100644 --- a/fs/ubifs/key.h +++ b/fs/ubifs/key.h | |||
@@ -229,23 +229,6 @@ static inline void xent_key_init(const struct ubifs_info *c, | |||
229 | } | 229 | } |
230 | 230 | ||
231 | /** | 231 | /** |
232 | * xent_key_init_hash - initialize extended attribute entry key without | ||
233 | * re-calculating hash function. | ||
234 | * @c: UBIFS file-system description object | ||
235 | * @key: key to initialize | ||
236 | * @inum: host inode number | ||
237 | * @hash: extended attribute entry name hash | ||
238 | */ | ||
239 | static inline void xent_key_init_hash(const struct ubifs_info *c, | ||
240 | union ubifs_key *key, ino_t inum, | ||
241 | uint32_t hash) | ||
242 | { | ||
243 | ubifs_assert(!(hash & ~UBIFS_S_KEY_HASH_MASK)); | ||
244 | key->u32[0] = inum; | ||
245 | key->u32[1] = hash | (UBIFS_XENT_KEY << UBIFS_S_KEY_HASH_BITS); | ||
246 | } | ||
247 | |||
248 | /** | ||
249 | * xent_key_init_flash - initialize on-flash extended attribute entry key. | 232 | * xent_key_init_flash - initialize on-flash extended attribute entry key. |
250 | * @c: UBIFS file-system description object | 233 | * @c: UBIFS file-system description object |
251 | * @k: key to initialize | 234 | * @k: key to initialize |
@@ -295,25 +278,6 @@ static inline void data_key_init(const struct ubifs_info *c, | |||
295 | } | 278 | } |
296 | 279 | ||
297 | /** | 280 | /** |
298 | * data_key_init_flash - initialize on-flash data key. | ||
299 | * @c: UBIFS file-system description object | ||
300 | * @k: key to initialize | ||
301 | * @inum: inode number | ||
302 | * @block: block number | ||
303 | */ | ||
304 | static inline void data_key_init_flash(const struct ubifs_info *c, void *k, | ||
305 | ino_t inum, unsigned int block) | ||
306 | { | ||
307 | union ubifs_key *key = k; | ||
308 | |||
309 | ubifs_assert(!(block & ~UBIFS_S_KEY_BLOCK_MASK)); | ||
310 | key->j32[0] = cpu_to_le32(inum); | ||
311 | key->j32[1] = cpu_to_le32(block | | ||
312 | (UBIFS_DATA_KEY << UBIFS_S_KEY_BLOCK_BITS)); | ||
313 | memset(k + 8, 0, UBIFS_MAX_KEY_LEN - 8); | ||
314 | } | ||
315 | |||
316 | /** | ||
317 | * trun_key_init - initialize truncation node key. | 281 | * trun_key_init - initialize truncation node key. |
318 | * @c: UBIFS file-system description object | 282 | * @c: UBIFS file-system description object |
319 | * @key: key to initialize | 283 | * @key: key to initialize |