]> git.baikalelectronics.ru Git - kernel.git/commit
mmap_region: cleanup the final vma_merge() related code
authorOleg Nesterov <oleg@tv-sign.ru>
Mon, 28 Apr 2008 09:12:10 +0000 (02:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Apr 2008 15:58:18 +0000 (08:58 -0700)
commit8610265aecbfe6239651a96e581f618b30a184e5
tree5935f5d9e741f63c190c4edf4d5f6f6005e33d0f
parent44a2da4b2b8501c737d9d3f468e5c793bff35b06
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>
mm/mmap.c