diff --git a/[refs] b/[refs] index 2527e12aec0e..04b3a94efc1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3edb2a68cb23cd6ca84022421eeae2604722cdc4 +refs/heads/master: eebc60840636e7351371fc17bcd057384bf0c16a diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c index 42dac27207ab..34610dc6d140 100644 --- a/trunk/fs/btrfs/transaction.c +++ b/trunk/fs/btrfs/transaction.c @@ -1451,9 +1451,9 @@ static int btrfs_flush_all_pending_stuffs(struct btrfs_trans_handle *trans, * it here and no for sure that nothing new will be added * to the list */ - btrfs_run_ordered_operations(root, 1); + ret = btrfs_run_ordered_operations(root, 1); - return 0; + return ret; } /*