diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-12-09 14:09:25 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2020-01-21 04:12:41 +0300 |
| commit | acf5f0be8a520c02bfed74cfc6735bf5fdd4a9e5 (patch) | |
| tree | b1e0990adac6a249f3dcb192d47ace4f90734fb3 /fs/adfs/dir.c | |
| parent | 1dd9f5babfd95fea5a77b27bab48c04c29db1f5f (diff) | |
| download | linux-acf5f0be8a520c02bfed74cfc6735bf5fdd4a9e5.tar.xz | |
fs/adfs: dir: add common directory sync method
adfs_fplus_sync() can be used for both directory formats since we now
have a common way to access the buffer heads, so move it into dir.c
and appropriately rename it. Remove the directory-format specific
implementations.
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.c')
| -rw-r--r-- | fs/adfs/dir.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c index f50302775504..16a2639d3ca5 100644 --- a/fs/adfs/dir.c +++ b/fs/adfs/dir.c @@ -38,6 +38,21 @@ static int adfs_dir_read(struct super_block *sb, u32 indaddr, return ADFS_SB(sb)->s_dir->read(sb, indaddr, size, dir); } +static int adfs_dir_sync(struct adfs_dir *dir) +{ + int err = 0; + int i; + + for (i = dir->nr_buffers - 1; i >= 0; i--) { + struct buffer_head *bh = dir->bhs[i]; + sync_dirty_buffer(bh); + if (buffer_req(bh) && !buffer_uptodate(bh)) + err = -EIO; + } + + return err; +} + void adfs_object_fixup(struct adfs_dir *dir, struct object_info *obj) { unsigned int dots, i; @@ -135,10 +150,8 @@ adfs_dir_update(struct super_block *sb, struct object_info *obj, int wait) printk(KERN_INFO "adfs_dir_update: object %06x in dir %06x\n", obj->indaddr, obj->parent_id); - if (!ops->update) { - ret = -EINVAL; - goto out; - } + if (!ops->update) + return -EINVAL; ret = adfs_dir_read(sb, obj->parent_id, 0, &dir); if (ret) @@ -149,7 +162,7 @@ adfs_dir_update(struct super_block *sb, struct object_info *obj, int wait) write_unlock(&adfs_dir_lock); if (wait) { - int err = ops->sync(&dir); + int err = adfs_dir_sync(&dir); if (!ret) ret = err; } |