From 25b7cd46dda5050349776e0c6e957529470bef29 Mon Sep 17 00:00:00 2001 From: Subrata Modak Date: Fri, 17 Jul 2009 18:28:12 +0300 Subject: [PATCH] --- yaml --- r: 164047 b: refs/heads/master c: b5148da40cb77ca84c4b0281e7049bb26d786592 h: refs/heads/master i: 164045: f82f292761da6fd8c165d96fae2061614bc1b625 164043: c2cf203ff57bbae91d98d51583527cf4bd94d25a 164039: fb412211594429085ccb5e91c6965458e3630735 164031: 0850d6819f474a65a298a4028925aba85cbcf73a v: v3 --- [refs] | 2 +- trunk/fs/ubifs/key.h | 36 ------------------------------------ 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/[refs] b/[refs] index cc27f1eeffce..4dd48b9e7635 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83ef2ecdbbd49cb0fbbfc7012b111b71664e386d +refs/heads/master: b5148da40cb77ca84c4b0281e7049bb26d786592 diff --git a/trunk/fs/ubifs/key.h b/trunk/fs/ubifs/key.h index 5fa27ea031ba..919af84b9e17 100644 --- a/trunk/fs/ubifs/key.h +++ b/trunk/fs/ubifs/key.h @@ -228,23 +228,6 @@ static inline void xent_key_init(const struct ubifs_info *c, key->u32[1] = hash | (UBIFS_XENT_KEY << UBIFS_S_KEY_HASH_BITS); } -/** - * xent_key_init_hash - initialize extended attribute entry key without - * re-calculating hash function. - * @c: UBIFS file-system description object - * @key: key to initialize - * @inum: host inode number - * @hash: extended attribute entry name hash - */ -static inline void xent_key_init_hash(const struct ubifs_info *c, - union ubifs_key *key, ino_t inum, - uint32_t hash) -{ - ubifs_assert(!(hash & ~UBIFS_S_KEY_HASH_MASK)); - key->u32[0] = inum; - key->u32[1] = hash | (UBIFS_XENT_KEY << UBIFS_S_KEY_HASH_BITS); -} - /** * xent_key_init_flash - initialize on-flash extended attribute entry key. * @c: UBIFS file-system description object @@ -294,25 +277,6 @@ static inline void data_key_init(const struct ubifs_info *c, key->u32[1] = block | (UBIFS_DATA_KEY << UBIFS_S_KEY_BLOCK_BITS); } -/** - * data_key_init_flash - initialize on-flash data key. - * @c: UBIFS file-system description object - * @k: key to initialize - * @inum: inode number - * @block: block number - */ -static inline void data_key_init_flash(const struct ubifs_info *c, void *k, - ino_t inum, unsigned int block) -{ - union ubifs_key *key = k; - - ubifs_assert(!(block & ~UBIFS_S_KEY_BLOCK_MASK)); - key->j32[0] = cpu_to_le32(inum); - key->j32[1] = cpu_to_le32(block | - (UBIFS_DATA_KEY << UBIFS_S_KEY_BLOCK_BITS)); - memset(k + 8, 0, UBIFS_MAX_KEY_LEN - 8); -} - /** * trun_key_init - initialize truncation node key. * @c: UBIFS file-system description object