> - if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))
> - return -EIO;
> + if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb)))) {
> + ret = -EIO;
> + goto out;
> + }
This just seems to add a call to trace_ext4_sync_file_exit for this
case, which seems unrelated to the patch.
> if (ret)
> - return ret;
> + goto out;
> +
Same here.
> /*
> * data=writeback,ordered:
> * The caller's filemap_fdatawrite()/wait will sync the data.
> @@ -152,7 +155,7 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
> needs_barrier = true;
> ret = jbd2_complete_transaction(journal, commit_tid);
> if (needs_barrier) {
> - issue_flush:
> +issue_flush:
> err = blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
And while I much prefer your new label placement it also doesn't
seem to belong into this patch.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
