ovl: Do d_type check only if work dir creation was successful (21765194) · Commits · 戴 / test

d_type check requires successful creation of workdir as iterates through work dir and expects work dir to be present in it. If that's not the case, this check will always return d_type not supported even if underlying filesystem might be supporting it. So don't do this check if work dir creation failed in previous step. Signed-off-by:

Vivek Goyal <vgoyal@redhat.com> Signed-off-by:

Miklos Szeredi <mszeredi@redhat.com>

fs/overlayfs/super.c

+11 −8

Original line number	Diff line number	Diff line
		@@ -1074,8 +1074,10 @@ static int ovl_fill_super(struct super_block sb, void data, int silent)
		/*
		* Upper should support d_type, else whiteouts are visible.
		* Given workdir and upper are on same fs, we can do
		* iterate_dir() on workdir.
		* iterate_dir() on workdir. This check requires successful
		* creation of workdir in previous step.
		*/
		if (ufs->workdir) {
		err = ovl_check_d_type_supported(&workpath);
		if (err < 0)
		goto out_put_workdir;
		@@ -1086,6 +1088,7 @@ static int ovl_fill_super(struct super_block sb, void data, int silent)
		goto out_put_workdir;
		}
		}
		}

		err = -ENOMEM;
		ufs->lower_mnt = kcalloc(numlower, sizeof(struct vfsmount *), GFP_KERNEL);

Admin message