diff options
| -rw-r--r-- | fs/isofs/inode.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index fe839b915116..d67a16f2a45d 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c | |||
| @@ -174,27 +174,6 @@ struct iso9660_options{ | |||
| 174 | * Compute the hash for the isofs name corresponding to the dentry. | 174 | * Compute the hash for the isofs name corresponding to the dentry. |
| 175 | */ | 175 | */ |
| 176 | static int | 176 | static int |
| 177 | isofs_hash_common(struct qstr *qstr, int ms) | ||
| 178 | { | ||
| 179 | const char *name; | ||
| 180 | int len; | ||
| 181 | |||
| 182 | len = qstr->len; | ||
| 183 | name = qstr->name; | ||
| 184 | if (ms) { | ||
| 185 | while (len && name[len-1] == '.') | ||
| 186 | len--; | ||
| 187 | } | ||
| 188 | |||
| 189 | qstr->hash = full_name_hash(name, len); | ||
| 190 | |||
| 191 | return 0; | ||
| 192 | } | ||
| 193 | |||
| 194 | /* | ||
| 195 | * Compute the hash for the isofs name corresponding to the dentry. | ||
| 196 | */ | ||
| 197 | static int | ||
| 198 | isofs_hashi_common(struct qstr *qstr, int ms) | 177 | isofs_hashi_common(struct qstr *qstr, int ms) |
| 199 | { | 178 | { |
| 200 | const char *name; | 179 | const char *name; |
| @@ -263,6 +242,27 @@ isofs_dentry_cmpi(const struct dentry *parent, const struct dentry *dentry, | |||
| 263 | } | 242 | } |
| 264 | 243 | ||
| 265 | #ifdef CONFIG_JOLIET | 244 | #ifdef CONFIG_JOLIET |
| 245 | /* | ||
| 246 | * Compute the hash for the isofs name corresponding to the dentry. | ||
| 247 | */ | ||
| 248 | static int | ||
| 249 | isofs_hash_common(struct qstr *qstr, int ms) | ||
| 250 | { | ||
| 251 | const char *name; | ||
| 252 | int len; | ||
| 253 | |||
| 254 | len = qstr->len; | ||
| 255 | name = qstr->name; | ||
| 256 | if (ms) { | ||
| 257 | while (len && name[len-1] == '.') | ||
| 258 | len--; | ||
| 259 | } | ||
| 260 | |||
| 261 | qstr->hash = full_name_hash(name, len); | ||
| 262 | |||
| 263 | return 0; | ||
| 264 | } | ||
| 265 | |||
| 266 | static int | 266 | static int |
| 267 | isofs_hash_ms(const struct dentry *dentry, struct qstr *qstr) | 267 | isofs_hash_ms(const struct dentry *dentry, struct qstr *qstr) |
| 268 | { | 268 | { |
