On Thu, 13 Nov 2014 17:47:51 +0000, Filipe David Manana wrote: [snip] > While Chris' integration/for-linus branches don't have the patch > included yet (nor do I in my local branch). Nevertheless, it's a > trivial conflict to solve, just leave Josef's changes and mine. So if I read this correctly the combined patch should look like this, right? --snip-- - btrfs_wait_marked_extents(log, &log->dirty_log_pages, mark); + ret = btrfs_wait_marked_extents(log, &log->dirty_log_pages, + mark); btrfs_wait_logged_extents(log, log_transid); wait_log_commit(trans, log_root_tree, root_log_ctx.log_transid); mutex_unlock(&log_root_tree->log_mutex); - ret = root_log_ctx.log_ret; + if (!ret) + ret = root_log_ctx.log_ret; goto out; --snip-- This saves the ret, logs the extents, commits and then handles any error. -h -- 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
