aboutsummaryrefslogtreecommitdiffstats
path: root/fs/adfs/dir_fplus.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2019-12-09 11:09:15 +0000
committerAl Viro <viro@zeniv.linux.org.uk>2020-01-20 20:12:40 -0500
commit95fbadbb5566e383f0cfe40d895e698ab38bdbc7 (patch)
tree97c0fc9d60b2f16765c9803ef52003bbdff93a74 /fs/adfs/dir_fplus.c
parentfs/adfs: dir: rename bh_fplus to bhs (diff)
downloadlinux-dev-95fbadbb5566e383f0cfe40d895e698ab38bdbc7.tar.xz
linux-dev-95fbadbb5566e383f0cfe40d895e698ab38bdbc7.zip
fs/adfs: dir: add common dir object initialisation
Initialise the dir object before we pass it down to the directory format specific read handler. This allows us to get rid of the initialisation inside those handlers. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/adfs/dir_fplus.c')
-rw-r--r--fs/adfs/dir_fplus.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/adfs/dir_fplus.c b/fs/adfs/dir_fplus.c
index 5f5420c9b943..52c42a9986d9 100644
--- a/fs/adfs/dir_fplus.c
+++ b/fs/adfs/dir_fplus.c
@@ -17,11 +17,6 @@ adfs_fplus_read(struct super_block *sb, unsigned int id, unsigned int sz, struct
unsigned int blk, size;
int i, ret = -EIO;
- dir->nr_buffers = 0;
-
- /* start off using fixed bh set - only alloc for big dirs */
- dir->bhs = &dir->bh[0];
-
block = __adfs_block_map(sb, id, 0);
if (!block) {
adfs_error(sb, "dir object %X has a hole at offset 0", id);
@@ -94,7 +89,6 @@ adfs_fplus_read(struct super_block *sb, unsigned int id, unsigned int sz, struct
}
dir->parent_id = le32_to_cpu(h->bigdirparent);
- dir->sb = sb;
return 0;
out: