Merge commit v3.13-rc1 into kbuild/misc

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 6aad98cb343f..1499b27b4186 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -32,7 +32,6 @@
 #include <linux/writeback.h>
 #include <linux/bit_spinlock.h>
 #include <linux/slab.h>
-#include "compat.h"
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
@@ -360,7 +359,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
         bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
 
         bio = compressed_bio_alloc(bdev, first_byte, GFP_NOFS);
-        if(!bio) {
+        if (!bio) {
                 kfree(cb);
                 return -ENOMEM;
         }