[SRU][EOAN][PATCH 1/2] Revert "UBUNTU: SAUCE: overlayfs: fix shitfs special-casing"

Kleber Sacilotto de Souza kleber.souza at canonical.com
Thu May 21 11:12:09 UTC 2020


BugLink: https://bugs.launchpad.net/bugs/1879690

This reverts commit 14d6145772cb9625ddd156189b0de68891925a4f.

The change applied for LP: #1857257 and its followup fix LP: #1876645
introduced a regression on overlayfs. Revert these commits for now.

Signed-off-by: Kleber Sacilotto de Souza <kleber.souza at canonical.com>
---
 fs/overlayfs/file.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
index a406736588d4..a2faa086ee4b 100644
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@ -32,7 +32,6 @@ static struct file *ovl_open_realfile(const struct file *file,
 	int flags = file->f_flags | O_NOATIME | FMODE_NONOTIFY;
 
 	old_cred = ovl_override_creds(inode->i_sb);
-	ovl_path_real(file->f_path.dentry, &realpath);
 	if (realpath.dentry->d_sb->s_magic == SHIFTFS_MAGIC)
 		realfile = open_with_fake_path(&realpath, flags, realinode,
 					       current_cred());
-- 
2.20.1




More information about the kernel-team mailing list