diff mbox series

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

Message ID 20200521111210.3568-2-kleber.souza@canonical.com
State New
Headers show
Series Reverts to fix overlayfs regression | expand

Commit Message

Kleber Sacilotto de Souza May 21, 2020, 11:12 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1879690

This reverts commit b3bdda24f1bc029c5e15671d678a448339fc5207.

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@canonical.com>
---
 fs/overlayfs/file.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Colin Ian King May 21, 2020, 11:21 a.m. UTC | #1
On 21/05/2020 12:12, Kleber Sacilotto de Souza wrote:
> BugLink: https://bugs.launchpad.net/bugs/1879690
> 
> This reverts commit b3bdda24f1bc029c5e15671d678a448339fc5207.
> 
> 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@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());
> 
Acked-by: Colin Ian King <colin.king@canonical.com>
diff mbox series

Patch

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());