From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Mon, 28 Apr 2008 09:12:10 +0000 (-0700)
Subject: mmap_region: cleanup the final vma_merge() related code
X-Git-Tag: v2.6.26-rc1~1004
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d3d5b41a72b52555d43efbfc4ccde6ba6e5444f;p=pandora-kernel.git

mmap_region: cleanup the final vma_merge() related code

It is not easy to actually understand the "if (!file || !vma_merge())"
code, turn it into "if (file && vma_merge())".  This makes immediately
obvious that the subsequent "if (file)" is superfluous.

As Hugh Dickins pointed out, we can also factor out the ->i_writecount
corrections, and add a small comment about that.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed