hfsplus: fix warnings in fs/hfsplus/bfind.c
fs/hfsplus/bfind.c: In function 'hfs_find_1st_rec_by_cnid': (1) include/uapi/linux/swab.h:60:2: warning: 'search_cnid' may be used uninitialized in this function [-Wmaybe-uninitialized] (2) include/uapi/linux/swab.h:60:2: warning: 'cur_cnid' may be used uninitialized in this function [-Wmaybe-uninitialized] [akpm@linux-foundation.org: make the workaround more explicit] Signed-off-by: Vyacheslav Dubeyko <slava@dubeyko.com> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
9509f17851
commit
5f3726f945
1 changed files with 6 additions and 2 deletions
|
@ -56,7 +56,8 @@ int hfs_find_1st_rec_by_cnid(struct hfs_bnode *bnode,
|
||||||
int *end,
|
int *end,
|
||||||
int *cur_rec)
|
int *cur_rec)
|
||||||
{
|
{
|
||||||
__be32 cur_cnid, search_cnid;
|
__be32 cur_cnid;
|
||||||
|
__be32 search_cnid;
|
||||||
|
|
||||||
if (bnode->tree->cnid == HFSPLUS_EXT_CNID) {
|
if (bnode->tree->cnid == HFSPLUS_EXT_CNID) {
|
||||||
cur_cnid = fd->key->ext.cnid;
|
cur_cnid = fd->key->ext.cnid;
|
||||||
|
@ -67,8 +68,11 @@ int hfs_find_1st_rec_by_cnid(struct hfs_bnode *bnode,
|
||||||
} else if (bnode->tree->cnid == HFSPLUS_ATTR_CNID) {
|
} else if (bnode->tree->cnid == HFSPLUS_ATTR_CNID) {
|
||||||
cur_cnid = fd->key->attr.cnid;
|
cur_cnid = fd->key->attr.cnid;
|
||||||
search_cnid = fd->search_key->attr.cnid;
|
search_cnid = fd->search_key->attr.cnid;
|
||||||
} else
|
} else {
|
||||||
|
cur_cnid = 0; /* used-uninitialized warning */
|
||||||
|
search_cnid = 0;
|
||||||
BUG();
|
BUG();
|
||||||
|
}
|
||||||
|
|
||||||
if (cur_cnid == search_cnid) {
|
if (cur_cnid == search_cnid) {
|
||||||
(*end) = (*cur_rec);
|
(*end) = (*cur_rec);
|
||||||
|
|
Loading…
Reference in a new issue