ovl: rename is_merge to is_lowest 78/307878/1
authorMiklos Szeredi <mszeredi@redhat.com>
Mon, 21 Mar 2016 16:31:46 +0000 (17:31 +0100)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Thu, 14 Mar 2024 02:20:56 +0000 (11:20 +0900)
commitd34fefea8d0188386c79f1cf212ccc814771d19d
treea313ab4c206002a617889c3b81e2d1f4249f4518
parent6be6340f480cb3a829abed7423fd3a99392c1345
ovl: rename is_merge to is_lowest

commit 56656e960b555cb98bc414382566dcb59aae99a2 upstream.

The 'is_merge' is an historical naming from when only a single lower layer
could exist.  With the introduction of multiple lower layers the meaning of
this flag was changed to mean only the "lowest layer" (while all lower
layers were being merged).

So now 'is_merge' is inaccurate and hence renaming to 'is_lowest'

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: SZ Lin (林上智) <sz.lin@moxa.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[sw0312.kim: cherry-pick linux-4.4.y commit 6586f61ab5bb to fix smack deny issue on overlayfs]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: I00655e4e8286d2d0e16b61e6d11e559c60ec4036
fs/overlayfs/readdir.c