Skip to content

Commit

Permalink
isofs: avoid unused function warning
Browse files Browse the repository at this point in the history
With the isofs_hash() function removed, isofs_hash_ms() is the only user
of isofs_hash_common(), but it's defined inside of an #ifdef, which triggers
this gcc warning in ARM axm55xx_defconfig starting with v3.18-rc3:

fs/isofs/inode.c:177:1: warning: 'isofs_hash_common' defined but not used [-Wunused-function]

This patch moves the function inside of the same #ifdef section to avoid that
warning, which seems the best compromise of a relatively harmless patch for
a late -rc.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: b0afd8e ("isofs: don't bother with ->d_op for normal case")
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Arnd Bergmann authored and Al Viro committed Nov 19, 2014
1 parent 4a7795d commit 7ca2f23
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions fs/isofs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,27 +170,6 @@ struct iso9660_options{
s32 sbsector;
};

/*
* Compute the hash for the isofs name corresponding to the dentry.
*/
static int
isofs_hash_common(struct qstr *qstr, int ms)
{
const char *name;
int len;

len = qstr->len;
name = qstr->name;
if (ms) {
while (len && name[len-1] == '.')
len--;
}

qstr->hash = full_name_hash(name, len);

return 0;
}

/*
* Compute the hash for the isofs name corresponding to the dentry.
*/
Expand Down Expand Up @@ -263,6 +242,27 @@ isofs_dentry_cmpi(const struct dentry *parent, const struct dentry *dentry,
}

#ifdef CONFIG_JOLIET
/*
* Compute the hash for the isofs name corresponding to the dentry.
*/
static int
isofs_hash_common(struct qstr *qstr, int ms)
{
const char *name;
int len;

len = qstr->len;
name = qstr->name;
if (ms) {
while (len && name[len-1] == '.')
len--;
}

qstr->hash = full_name_hash(name, len);

return 0;
}

static int
isofs_hash_ms(const struct dentry *dentry, struct qstr *qstr)
{
Expand Down

0 comments on commit 7ca2f23

Please sign in to comment.