On 2017/6/26 13:31, Amir Goldstein Wrote: > On Mon, Jun 26, 2017 at 4:22 AM, zhangyi (F) <yi.zhang@xxxxxxxxxx> wrote: >> On 2017/6/25 22:14, Amir Goldstein Wrote: >>> If a non-merge dir in an overlay mount has an overlay.origin xattr, it >>> means it was once an upper merge dir, which may contain whiteouts and >>> then the lower dir was removed under it. >>> >>> Do not iterate real dir directly in this case to avoid exposing whiteouts. >>> >>> Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx> >>> --- >>> fs/overlayfs/readdir.c | 29 +++++++++++++++++++++++++---- >>> 1 file changed, 25 insertions(+), 4 deletions(-) >>> >>> Yi, >>> >>> You missed a very big spot and so did I in review. >>> Your patch doen't hide whiteouts from readdir and it doesn't >>> even pass you own xfstest... >>> >>> Anyway, here are the missing parts picked from my impure readdir >>> patch. >>> >> >> Hi Amir, >> >> Yes, I missed whiteouts check in readdir because I saw your readdir >> patch has already fix it, so my xfstest test this case. Do you >> think we should merge this two patch ? >> > > Yes, only two problems with my readdir patch: > 1. Miklos rejected it (for now) > 2. It only complements your V2 patch (impure), not your V3 patch (origin) > Indeed, thanks for this patch. > So we need those two patches, it's fine if they stay separate because > they fix two related, but distinguished problems (expose whiteouts and rmdir). > > I just want to highlight that I did not test the lower layer with origin case, > not sure if you did? There were bugs related to unexpected overlay objects > in lower layer in the past, see xfstest overlay/014 for example test. > I tested the lower layer with origin case baseed on these two patches, there is no problem, whiteouts are not exposed and rmdir/rename execute successfully. > So if you can, please post a patch to extend test overlay/031 to mount > the "origin" with whiteout dir as lower layer and repeat the "ls" and > "rmdir" tests. > Okay, I am glad to post it, thanks. Thanks, ZhangYi. -- To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
