Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for...

[deliverable/linux.git] / fs / btrfs / tree-log.h

diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
index e2e798ae7cd7c6c989a6633fe7dae682ab4a5148..154990c26dcbc9d63508228b9125182b7168b80e 100644 (file)
--- a/fs/btrfs/tree-log.h
+++ b/fs/btrfs/tree-log.h
@@ -28,6 +28,7 @@
 struct btrfs_log_ctx {
        int log_ret;
        int log_transid;
+       int io_err;
        struct list_head list;
 };
 
@@ -35,6 +36,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
 {
        ctx->log_ret = 0;
        ctx->log_transid = 0;
+       ctx->io_err = 0;
        INIT_LIST_HEAD(&ctx->list);
 }