|
@@ -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.
|
|
|
*/
|
|
@@ -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)
|
|
|
{
|