summaryrefslogtreecommitdiffstats
path: root/fs/adfs/dir_fplus.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2019-03-24 13:22:28 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2019-05-31 10:30:57 +0100
commitadb514a4e0f6d87ff43d1bc0a948c38530a0dc83 (patch)
treea02ad23959cab97dc61b30e96eb925dc16d1eaed /fs/adfs/dir_fplus.c
parent411c49bcf32d36b9988dc27968a92f3edf8ebed1 (diff)
downloadlinux-adb514a4e0f6d87ff43d1bc0a948c38530a0dc83.tar.gz
linux-adb514a4e0f6d87ff43d1bc0a948c38530a0dc83.tar.bz2
linux-adb514a4e0f6d87ff43d1bc0a948c38530a0dc83.zip
fs/adfs: factor out filename fixup
Move the filename fixup to adfs_object_fixup() so we only have one implementation of this. Acked-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'fs/adfs/dir_fplus.c')
-rw-r--r--fs/adfs/dir_fplus.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/adfs/dir_fplus.c b/fs/adfs/dir_fplus.c
index 308009d00a5b..97b9f28f459b 100644
--- a/fs/adfs/dir_fplus.c
+++ b/fs/adfs/dir_fplus.c
@@ -169,7 +169,7 @@ adfs_fplus_getnext(struct adfs_dir *dir, struct object_info *obj)
(struct adfs_bigdirheader *) dir->bh_fplus[0]->b_data;
struct adfs_bigdirentry bde;
unsigned int offset;
- int i, ret = -ENOENT;
+ int ret = -ENOENT;
if (dir->pos >= le32_to_cpu(h->bigdirentries))
goto out;
@@ -193,10 +193,6 @@ adfs_fplus_getnext(struct adfs_dir *dir, struct object_info *obj)
offset += le32_to_cpu(bde.bigdirobnameptr);
dir_memcpy(dir, offset, obj->name, obj->name_len);
- for (i = 0; i < obj->name_len; i++)
- if (obj->name[i] == '/')
- obj->name[i] = '.';
-
adfs_object_fixup(dir, obj);
dir->pos += 1;