From patchwork Thu May 21 11:12:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 1295127 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49SRm636NPz9sSg; Thu, 21 May 2020 21:12:22 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jbj7Y-00059u-B3; Thu, 21 May 2020 11:12:16 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jbj7W-00059e-Lw for kernel-team@lists.ubuntu.com; Thu, 21 May 2020 11:12:14 +0000 Received: from mail-ej1-f71.google.com ([209.85.218.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jbj7W-0002CV-EU for kernel-team@lists.ubuntu.com; Thu, 21 May 2020 11:12:14 +0000 Received: by mail-ej1-f71.google.com with SMTP id h6so2657805ejb.17 for ; Thu, 21 May 2020 04:12:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+gB5kXajTiqxrDifnZz9elpV6rsqlJ2OclPrV/VC4wo=; b=cUVhuqt3puBsaiFmOoXJk9iFDgjIPI6KdYuUYm8anAUEFvUJ5PRq0oY8HZEKvowOC4 bioCwvlMp5CzPnRWQq3XHGK/Y9lwJ58c8BV0kIuGVDaGFryzwPCDsep7l1w4fJlvcyIg j6Nbec31Dqntkd2kCioXAn1JwgpGjmrMu/QUZUY/PDyifP8BPnrgEmrn/uxOXsslnFJC t/QKbIhvcHH5HXNlA9cEW7iKhyZl+XJ/gdu3/LDnGBDp63sO+ec5JsP6t52uq38k4o+b cF+eBCZKfVQ7EJ1K4qf06/j0Jj/1bQ2bmkeFoo2bAPwY0cUNw0ONqJOAMLEk05pAjvO8 YpSg== X-Gm-Message-State: AOAM530z3Jw6tm6s7h8r1246adlZbuSRtqYXlU8bRuo/2VUY98swL5fA eWvCpbiYHPF4HaCzyZcf6gVNurzcHBHTnUbJ5z4uAhmP5DTMAPULeHiHsP4SiQHKE/emR0FFhE2 kabkRMVc/lN4oiT2fW7AShzGoTpaHBmkBeNmaiKYFkQ== X-Received: by 2002:a50:9e6a:: with SMTP id z97mr6943890ede.375.1590059533863; Thu, 21 May 2020 04:12:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXddz9rYt6lIZLY2ty79pGwrMmc6BmB4q7PFYAXXY3Zyg/UiCbCRxmuYfz7iRxOI4nJQghhQ== X-Received: by 2002:a50:9e6a:: with SMTP id z97mr6943875ede.375.1590059533485; Thu, 21 May 2020 04:12:13 -0700 (PDT) Received: from localhost (ip5f5af656.dynamic.kabel-deutschland.de. [95.90.246.86]) by smtp.gmail.com with ESMTPSA id o13sm4492926ejn.19.2020.05.21.04.12.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2020 04:12:12 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [SRU][FOCAL][PATCH 1/2] Revert "UBUNTU: SAUCE: overlayfs: fix shitfs special-casing" Date: Thu, 21 May 2020 13:12:07 +0200 Message-Id: <20200521111210.3568-2-kleber.souza@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200521111210.3568-1-kleber.souza@canonical.com> References: <20200521111210.3568-1-kleber.souza@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 Acked-by: Colin Ian King --- 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()); From patchwork Thu May 21 11:12:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 1295125 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49SRm63C7Gz9sSk; Thu, 21 May 2020 21:12:22 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jbj7a-0005At-Lu; Thu, 21 May 2020 11:12:18 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jbj7Y-00059o-4z for kernel-team@lists.ubuntu.com; Thu, 21 May 2020 11:12:16 +0000 Received: from mail-ej1-f70.google.com ([209.85.218.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jbj7X-0002Cl-SM for kernel-team@lists.ubuntu.com; Thu, 21 May 2020 11:12:15 +0000 Received: by mail-ej1-f70.google.com with SMTP id n15so2645451ejh.23 for ; Thu, 21 May 2020 04:12:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZXqo2kLe/2kZ0/RFzIeh+TH1RH8nYdepeVRceCckVsE=; b=ALYxrg0GCmIxapuS+4YUiAG9DUvh4AtuIRFu11D8B+Uynys3MqV2ZoRIithDESgWnQ 5VzMT0AQ+z7UOQfFrUl31GniDav8Ey4ULju8vcvT18U5EZ2SlZD18Rv4qYthcSkgYX5/ vyKTfcLx6TdBgXaPO39GbG7QOViLJjDKcrx+iGnB9b3h+fKQM/IKpRICwa1vSeCL34hi nA7ZrIErtBq3GNDWrqQRo/hBySgmn4MTAKVxtt1Qenr3Aa56sB8dMqA5JTbHanP1IHJK 6o2LYx0JczpK4uRFU3M9gy0cBfof5MC88lo0QKQKoTnmvPXHPI/PqS39ddMYJWFHRfWi OKjw== X-Gm-Message-State: AOAM531aHJjZa/jrzwMR1N30Y3VZeWBgyKOZP0/Qs8MoiCI6N/bw1NO9 K5OjCxC4jxtBLOKNRzQ7+/4PuCl8BTYF20yBWJvvbR4mfygPD510tdh+O0XhFMo25Vyhj+DZpqA 7vP1XKlep91DD/5/YUG4iA4ExmBoZl0r/YAuzS/Zn4g== X-Received: by 2002:a17:906:3944:: with SMTP id g4mr2921765eje.55.1590059535191; Thu, 21 May 2020 04:12:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqwI93yJwrkpJI4kP8FXOEvsoLsliC1wP22fZZ9V/8xSFWj5ZUCmHTSM8hYkOXZF2P67SodQ== X-Received: by 2002:a17:906:3944:: with SMTP id g4mr2921739eje.55.1590059534857; Thu, 21 May 2020 04:12:14 -0700 (PDT) Received: from localhost (ip5f5af656.dynamic.kabel-deutschland.de. [95.90.246.86]) by smtp.gmail.com with ESMTPSA id gf25sm4553924ejb.54.2020.05.21.04.12.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2020 04:12:14 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [SRU][FOCAL][PATCH 2/2] Revert "UBUNTU: SAUCE: overlayfs: use shiftfs hacks only with shiftfs as underlay" Date: Thu, 21 May 2020 13:12:08 +0200 Message-Id: <20200521111210.3568-3-kleber.souza@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200521111210.3568-1-kleber.souza@canonical.com> References: <20200521111210.3568-1-kleber.souza@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1879690 This reverts commit 6f18a8434050333afc80b5bfce2e0e994c86b790. 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 Acked-by: Colin Ian King --- fs/overlayfs/file.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index a2faa086ee4b..1a1c1746bf83 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -3,7 +3,6 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include #include #include #include @@ -32,12 +31,9 @@ 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); - if (realpath.dentry->d_sb->s_magic == SHIFTFS_MAGIC) - realfile = open_with_fake_path(&realpath, flags, realinode, - current_cred()); - else - realfile = open_with_fake_path(&file->f_path, flags, realinode, - current_cred()); + ovl_path_real(file->f_path.dentry, &realpath); + realfile = open_with_fake_path(&realpath, flags, realinode, + current_cred()); revert_creds(old_cred); pr_debug("open(%p[%pD2/%c], 0%o) -> (%p, 0%o)\n",