overlayfs: Do d_type check only if work dir creation was successful

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 <[email protected]>

---
 fs/overlayfs/super.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

fs/overlayfs/super.c +11 -8

index 791235e..48234425 100644
@@ -1064,16 +1064,19 @@ 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.
 		 */
-		err = ovl_check_d_type_supported(&workpath);
-		if (err < 0)
-			goto out_put_workdir;
+		if (ufs->workdir) {
+			err = ovl_check_d_type_supported(&workpath);
+			if (err < 0)
+				goto out_put_workdir;
 
-		if (!err) {
-			pr_err("overlayfs: upper fs needs to support d_type.\n");
-			err = -EINVAL;
-			goto out_put_workdir;
+			if (!err) {
+				pr_err("overlayfs: upper fs needs to support d_type.\n");
+				err = -EINVAL;
+				goto out_put_workdir;
+			}
 		}
 	}
 

Signature · 6 lines

2.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Hi Vivek.

Quoted 5 lines · Vivek Goyal

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.

ovl_check_d_type_supported, will call iterate_dir(), which is supposed to return -ENOENT if the work dir is not present AFAICT, isn't that enough to detect if work dir is present and handle it accordingly?

I recently started to learn overlay code, so my apologies if my above comment is not true.

Cheers

Quoted 46 lines

So don't do this check if work dir creation failed in previous step.

Signed-off-by Vivek Goyal <[email protected]>

---
 fs/overlayfs/super.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

fs/overlayfs/super.c +11 -8

index 791235e..48234425 100644
@@ -1064,16 +1064,19 @@ 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.
 		 */
-		err = ovl_check_d_type_supported(&workpath);
-		if (err < 0)
-			goto out_put_workdir;
+		if (ufs->workdir) {
+			err = ovl_check_d_type_supported(&workpath);
+			if (err < 0)
+				goto out_put_workdir;
 
-		if (!err) {
-			pr_err("overlayfs: upper fs needs to support d_type.\n");
-			err = -EINVAL;
-			goto out_put_workdir;
+			if (!err) {
+				pr_err("overlayfs: upper fs needs to support d_type.\n");
+				err = -EINVAL;
+				goto out_put_workdir;
+			}
 		}
 	}
 

Signature · 6 lines

2.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Signature · 1 line

Carlos

Quoted 9 lines · Carlos Maiolino

Hi Vivek.

Quoted 5 lines · Vivek Goyal

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.

Quoted 3 lines

ovl_check_d_type_supported, will call iterate_dir(), which is supposed to return -ENOENT if the work dir is not present AFAICT, isn't that enough to detect if work dir is present and handle it accordingly?

Hi Carlos,

So there is directory "work" under user specified workdir. Say user specified "overlaywork" as workdir, then we are listing contents of " overlaywork" and which should find "work" underneath it. Even if "work" creation failed, "." and ".." are found and returned and their types are returned as DT_DIR (despite the fact that filesystem does not support d_type").

So in short, I am not getting -ENOENT if work dir creation failed.

Thanks
Vivek