From patchwork Tue May 29 14:43:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miklos Szeredi X-Patchwork-Id: 10435721 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9136E60327 for ; Tue, 29 May 2018 14:44:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 820BA28414 for ; Tue, 29 May 2018 14:44:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74B232863D; Tue, 29 May 2018 14:44:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 274AD28414 for ; Tue, 29 May 2018 14:44:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935115AbeE2Oos (ORCPT ); Tue, 29 May 2018 10:44:48 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:52271 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935810AbeE2OoU (ORCPT ); Tue, 29 May 2018 10:44:20 -0400 Received: by mail-wm0-f67.google.com with SMTP id 18-v6so35803890wml.2 for ; Tue, 29 May 2018 07:44:19 -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:cc:subject:date:message-id:in-reply-to :references; bh=XAqtlJKk0KFtCftADSZIIfBbqS7mvtSTKiWscehsItY=; b=OETPiSr3/Wa07Bgi83tIwSMZjXRvGqnt+N/cpXi1sfNdgG8Y6LmAGo9y7qoTIz6e4E 1Rx/52qSr9hTotujlYx+kimORl7/h22M59+KeEB5yGjvSH0wGuYEBWOkJnBcjO6bCKC0 pOIIuaednrut9YbY7pqak2ybbWJcC6U0Nfpdm6AxAv6rZV4YtDHCAvArVOUkWCiX94eJ +L9FSBQIuVO2HEOXQXkY/rHfe23Sy7WMugYak/mtqzuetrETkS9RACmFxLdXQ1cLKOdZ 8UHW+pkefqSlLwv8bDRi28m6gRnrRz1ucHvOsVTrfK4qXeWQywudlqcw2JmT9GoIbVsV cz8Q== X-Gm-Message-State: ALKqPweLlR4me6GDw4fUUDMl7FWWe+Vi3OJ7YOaAgHtVxoXrgdVS5YjX XXfNaBmUq84ZmFQXE583SDFrZPDGQtI= X-Google-Smtp-Source: ADUXVKKPiDesnReF6XCd6woEaJs2kDJYHZUj4CIPXUzXiC8O0LwP7fLAdSXZD8d48ur19/d6SxYlxA== X-Received: by 2002:a1c:ea1a:: with SMTP id i26-v6mr12858872wmh.11.1527605058545; Tue, 29 May 2018 07:44:18 -0700 (PDT) Received: from veci.piliscsaba.redhat.com (catv-176-63-54-97.catv.broadband.hu. [176.63.54.97]) by smtp.gmail.com with ESMTPSA id t198-v6sm18834422wmt.23.2018.05.29.07.44.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 07:44:17 -0700 (PDT) From: Miklos Szeredi To: linux-unionfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 30/39] Revert "ovl: fix may_write_real() for overlayfs directories" Date: Tue, 29 May 2018 16:43:30 +0200 Message-Id: <20180529144339.16538-31-mszeredi@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180529144339.16538-1-mszeredi@redhat.com> References: <20180529144339.16538-1-mszeredi@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 954c736f865d6c0c68ae4263a2f3502ee7c447a3. Overlayfs no longer relies on the vfs for checking writability of files. Signed-off-by: Miklos Szeredi --- fs/namespace.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index 5f75969adff1..c3f7152a8419 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -468,9 +468,7 @@ static inline int may_write_real(struct file *file) /* File refers to upper, writable layer? */ upperdentry = d_real(dentry, NULL, 0, D_REAL_UPPER); - if (upperdentry && - (file_inode(file) == d_inode(upperdentry) || - file_inode(file) == d_inode(dentry))) + if (upperdentry && file_inode(file) == d_inode(upperdentry)) return 0; /* Lower layer: can't write to real file, sorry... */