From: Filipe Manana <fdmanana@suse.com>
Date: Tue, 14 Jul 2015 13:06:47 +0000 (+0100)
Subject: Btrfs: add missing inode item update in fallocate()
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f48fa2cf6d6c0223d4bddcffd5a74a91620c64d;p=linux

Btrfs: add missing inode item update in fallocate()
(bnc#938023).

suse-commit: 4f61a739e2bef56c25f9a883afff48bffcd47515
(cherry picked from commit dfe466f4e9ea672ee944c0493bdb0659afd2da7d)

Conflicts:
	fs/btrfs/file.c
---

diff --git a/.config b/.config
index 4bdc3cc1b62d..14618f71b298 100644
--- a/.config
+++ b/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.1.0 Kernel Configuration
+# Linux/x86_64 4.1.2-zb64 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y