summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/transaction.h
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-05-25 22:51:03 +0200
committerDavid Sterba <dsterba@suse.com>2016-05-25 22:51:03 +0200
commit42f31734eb7658fd01fb186d56312be869450a42 (patch)
treeb2fb549b9549bead4d2837c81760cf87fa50ad43 /fs/btrfs/transaction.h
parente73440868fde7cce4a93583a4fa2db9a8938a7ed (diff)
parent0132761017e012ab4dc8584d679503f2ba26ca86 (diff)
downloadlinux-stable-42f31734eb7658fd01fb186d56312be869450a42.tar.gz
linux-stable-42f31734eb7658fd01fb186d56312be869450a42.tar.bz2
linux-stable-42f31734eb7658fd01fb186d56312be869450a42.zip
Merge branch 'cleanups-4.7' into for-chris-4.7-20160525
Diffstat (limited to 'fs/btrfs/transaction.h')
-rw-r--r--fs/btrfs/transaction.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index 72be51f7ca2f..9fe0ec2bf0fe 100644
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -144,7 +144,7 @@ struct btrfs_pending_snapshot {
/* block reservation for the operation */
struct btrfs_block_rsv block_rsv;
u64 qgroup_reserved;
- /* extra metadata reseration for relocation */
+ /* extra metadata reservation for relocation */
int error;
bool readonly;
struct list_head list;