From: Sage Weil <sage@inktank.com>
Date: Thu, 2 May 2013 04:15:58 +0000 (-0700)
Subject: ceph: revert commit 22cddde104
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~26^2~242
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7971bd92baf729fcebe04d7330ac22dc668d0261;p=pandora-kernel.git

ceph: revert commit 22cddde104

commit 22cddde104 breaks the atomicity of write operation, it also
introduces a deadlock between write and truncate.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Greg Farnum <greg@inktank.com>

Conflicts:
	fs/ceph/addr.c
---

Reading git-diff-tree failed