@@ -92,7 +92,6 @@ static inline uint32_t key_test_hash(const char *str, int len)
/**
* ino_key_init - initialize inode key.
- * @c: UBIFS file-system description object
* @key: key to initialize
* @inum: inode number
*/
@@ -208,12 +207,10 @@ static inline int keys_cmp(const union ubifs_key *key1,
/**
* key_read - transform a key to in-memory format.
- * @c: UBIFS file-system description object
* @from: the key to transform
* @to: the key to store the result
*/
-static inline void key_read(const struct ubifs_info *c __attribute__((unused)), const void *from,
- union ubifs_key *to)
+static inline void key_read(const void *from, union ubifs_key *to)
{
const union ubifs_key *f = from;
@@ -223,45 +220,38 @@ static inline void key_read(const struct ubifs_info *c __attribute__((unused)),
/**
* invalid_key_init - initialize invalid node key.
- * @c: UBIFS file-system description object
* @key: key to initialize
*
* This is a helper function which marks a @key object as invalid.
*/
-static inline void invalid_key_init(const struct ubifs_info *c __attribute__((unused)),
- union ubifs_key *key)
+static inline void invalid_key_init(union ubifs_key *key)
{
key->u32[0] = 0xDEADBEAF;
key->u32[1] = UBIFS_INVALID_KEY;
}
/**
* key_type - get key type.
- * @c: UBIFS file-system description object
* @key: key to get type of
*/
-static inline int key_type(const struct ubifs_info *c __attribute__((unused)),
- const union ubifs_key *key)
+static inline int key_type(const union ubifs_key *key)
{
return key->u32[1] >> UBIFS_S_KEY_BLOCK_BITS;
}
/*
* key_hash - get directory entry hash.
- * @c: UBIFS file-system description object
* @key: the key to get hash from
*/
-static inline uint32_t key_hash(const struct ubifs_info *c __attribute__((unused)),
- const union ubifs_key *key)
+static inline uint32_t key_hash(const union ubifs_key *key)
{
return key->u32[1] & UBIFS_S_KEY_HASH_MASK;
}
/**
* key_inum - fetch inode number from key.
- * @c: UBIFS file-system description object
* @k: key to fetch inode number from
*/
-static inline ino_t key_inum(const struct ubifs_info *c __attribute__((unused)), const void *k)
+static inline ino_t key_inum(const void *k)
{
const union ubifs_key *key = k;
@@ -270,11 +260,9 @@ static inline ino_t key_inum(const struct ubifs_info *c __attribute__((unused)),
/**
* key_block - get data block number.
- * @c: UBIFS file-system description object
* @key: the key to get the block number from
*/
-static inline unsigned int key_block(const struct ubifs_info *c __attribute__((unused)),
- const union ubifs_key *key)
+static inline unsigned int key_block(const union ubifs_key *key)
{
return key->u32[1] & UBIFS_S_KEY_BLOCK_MASK;
}
@@ -162,15 +162,13 @@ void ubifs_end_scan(const struct ubifs_info *c, struct ubifs_scan_leb *sleb,
/**
* ubifs_add_snod - add a scanned node to LEB scanning information.
- * @c: UBIFS file-system description object
* @sleb: scanning information
* @buf: buffer containing node
* @offs: offset of node on flash
*
* This function returns %0 on success and a negative error code on failure.
*/
-int ubifs_add_snod(const struct ubifs_info *c, struct ubifs_scan_leb *sleb,
- void *buf, int offs)
+int ubifs_add_snod(struct ubifs_scan_leb *sleb, void *buf, int offs)
{
struct ubifs_ch *ch = buf;
struct ubifs_ino_node *ino = buf;
@@ -195,10 +193,10 @@ int ubifs_add_snod(const struct ubifs_info *c, struct ubifs_scan_leb *sleb,
* The key is in the same place in all keyed
* nodes.
*/
- key_read(c, &ino->key, &snod->key);
+ key_read(&ino->key, &snod->key);
break;
default:
- invalid_key_init(c, &snod->key);
+ invalid_key_init(&snod->key);
break;
}
list_add_tail(&snod->list, &sleb->nodes);
@@ -267,7 +265,7 @@ struct ubifs_scan_leb *ubifs_scan(const struct ubifs_info *c, int lnum,
goto error;
}
- err = ubifs_add_snod(c, sleb, buf, offs);
+ err = ubifs_add_snod(sleb, buf, offs);
if (err)
goto error;
@@ -91,30 +91,30 @@ const char *dbg_snprintf_key(const struct ubifs_info *c,
const union ubifs_key *key, char *buffer, int len)
{
char *p = buffer;
- int type = key_type(c, key);
+ int type = key_type(key);
if (c->key_fmt == UBIFS_SIMPLE_KEY_FMT) {
switch (type) {
case UBIFS_INO_KEY:
len -= snprintf(p, len, "(%lu, %s)",
- (unsigned long)key_inum(c, key),
+ (unsigned long)key_inum(key),
get_key_type(type));
break;
case UBIFS_DENT_KEY:
case UBIFS_XENT_KEY:
len -= snprintf(p, len, "(%lu, %s, %#08x)",
- (unsigned long)key_inum(c, key),
- get_key_type(type), key_hash(c, key));
+ (unsigned long)key_inum(key),
+ get_key_type(type), key_hash(key));
break;
case UBIFS_DATA_KEY:
len -= snprintf(p, len, "(%lu, %s, %u)",
- (unsigned long)key_inum(c, key),
- get_key_type(type), key_block(c, key));
+ (unsigned long)key_inum(key),
+ get_key_type(type), key_block(key));
break;
case UBIFS_TRUN_KEY:
len -= snprintf(p, len, "(%lu, %s)",
- (unsigned long)key_inum(c, key),
+ (unsigned long)key_inum(key),
get_key_type(type));
break;
default:
@@ -252,7 +252,7 @@ void dump_node(const struct ubifs_info *c, const void *node)
{
const struct ubifs_ino_node *ino = node;
- key_read(c, &ino->key, &key);
+ key_read(&ino->key, &key);
printf("\t\tkey \t\t\t\t%s\n",
dbg_snprintf_key(c, &key, key_buf, DBG_KEY_BUF_LEN));
printf("\t\tcreat_sqnum \t\t\t%llu\n",
@@ -287,7 +287,7 @@ void dump_node(const struct ubifs_info *c, const void *node)
const struct ubifs_dent_node *dent = node;
int nlen = le16_to_cpu(dent->nlen);
- key_read(c, &dent->key, &key);
+ key_read(&dent->key, &key);
printf("\t\tkey \t\t\t\t%s\n",
dbg_snprintf_key(c, &key, key_buf, DBG_KEY_BUF_LEN));
printf("\t\tinum \t\t\t\t%llu\n",
@@ -311,7 +311,7 @@ void dump_node(const struct ubifs_info *c, const void *node)
const struct ubifs_data_node *dn = node;
int dlen = le32_to_cpu(ch->len) - UBIFS_DATA_NODE_SZ;
- key_read(c, &dn->key, &key);
+ key_read(&dn->key, &key);
printf("\t\tkey \t\t\t\t%s\n",
dbg_snprintf_key(c, &key, key_buf, DBG_KEY_BUF_LEN));
printf("\t\tsize \t\t\t\t%u\n", le32_to_cpu(dn->size));
@@ -347,7 +347,7 @@ void dump_node(const struct ubifs_info *c, const void *node)
const struct ubifs_branch *br;
br = ubifs_idx_branch(c, idx, i);
- key_read(c, &br->key, &key);
+ key_read(&br->key, &key);
printf("\t\t%d: LEB %d:%d len %d key %s\n",
i, le32_to_cpu(br->lnum), le32_to_cpu(br->offs),
le32_to_cpu(br->len),