From: Eric Sandeen <sandeen@redhat.com>
Date: Fri, 8 Nov 2013 03:22:08 +0000 (-0500)
Subject: ext4: remove unreachable code after ext4_can_extents_be_merged()
X-Git-Tag: v3.13-rc1~86^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2754114400afe38ad5ade3b588451c4f36a61af;p=pandora-kernel.git

ext4: remove unreachable code after ext4_can_extents_be_merged()

Commit ec22ba8e ("ext4: disable merging of uninitialized extents")
ensured that if either extent under consideration is uninit, we
decline to merge, and ext4_can_extents_be_merged() returns false.

So there is no need for the caller to then test whether the
extent under consideration is unitialized; if it were, we
wouldn't have gotten that far.

The comments were also inaccurate; ext4_can_extents_be_merged()
no longer XORs the states, it fails if *either* is uninit.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Zheng Liu <wenqing.lz@taobao.com>
---

Reading git-diff-tree failed