Re: [PATCH 2/6] btrfs: do commit in sync_fs if there are pending changes

[Filipe David Manana <fdmanana@gmail.com>]

On Fri, Nov 14, 2014 at 10:33 AM, David Sterba <dsterba@suse.cz> wrote:
> If a pending change is requested, it's not processed unless there is a
> transaction commit about to happen, not even after sync or SYNC_FS
> ioctl. For example a remount that toggles the inode_cache option will
> not take effect after sync on a quiescent filesystem.
>
> Signed-off-by: David Sterba <dsterba@suse.cz>
> ---
>  fs/btrfs/super.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
> index 54bd91ece35b..1da16d59e115 100644
> --- a/fs/btrfs/super.c
> +++ b/fs/btrfs/super.c
> @@ -993,9 +993,17 @@ int btrfs_sync_fs(struct super_block *sb, int wait)
>         trans = btrfs_attach_transaction_barrier(root);
>         if (IS_ERR(trans)) {
>                 /* no transaction, don't bother */
> -               if (PTR_ERR(trans) == -ENOENT)
> -                       return 0;
> -               return PTR_ERR(trans);
> +               if (PTR_ERR(trans) == -ENOENT) {
> +                       /*
> +                        * Exit unless we have some pending changes
> +                        * that need to go through commit
> +                        */
> +                       if (fs_info->pending_changes == 0)
> +                               return 0;
> +                       trans = btrfs_start_transaction(root, 0);

Missing check for IS_ERR(trans)

The rest looks good.
Thanks

> +               } else {
> +                       return PTR_ERR(trans);
> +               }
>         }
>         return btrfs_commit_transaction(trans, root);
>  }
> --
> 1.8.4.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Filipe David Manana,

"Reasonable men adapt themselves to the world.
 Unreasonable men adapt the world to themselves.
 That's why all progress depends on unreasonable men."