tree 5935f5d9e741f63c190c4edf4d5f6f6005e33d0f
parent 0dd1334faf7e075bfdb6f5284eed65210b296fc1
author Oleg Nesterov <oleg@tv-sign.ru> 1209373930 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1209398298 -0700

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>