From patchwork Thu Dec 1 10:15:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miklos Szeredi X-Patchwork-Id: 9455729 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 8CCDF60756 for ; Thu, 1 Dec 2016 10:15:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DFF0283BB for ; Thu, 1 Dec 2016 10:15:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73341284CF; Thu, 1 Dec 2016 10:15:45 +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=-6.9 required=2.0 tests=BAYES_00,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 BD8E7284CB for ; Thu, 1 Dec 2016 10:15:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756682AbcLAKPW (ORCPT ); Thu, 1 Dec 2016 05:15:22 -0500 Received: from mail-wj0-f177.google.com ([209.85.210.177]:35664 "EHLO mail-wj0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756512AbcLAKPS (ORCPT ); Thu, 1 Dec 2016 05:15:18 -0500 Received: by mail-wj0-f177.google.com with SMTP id v7so199900355wjy.2 for ; Thu, 01 Dec 2016 02:15:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hiJWls5cN+76wiyFhy30XaJ6b+1X+PTnRlsbtoYaJFA=; b=d5panRxP74VHQiVKRyU8EsmkxuPgzia5cMj63c/pYKYfxtd7jqZjXgKyiFfx6Rmd4s yFdlXodI8YxorATvmjMbl9LeE8Y6qU1/ZPtSr5KjozZVsQl2pHaTVSoruhbtW9uYBpF/ jqgXR5fJjdppTCixIelEWunjVOnZvjmg2a51eNPxmhq3AxmmK/aKPhQgqoeuKHwOeMG7 mX/aOP2u10g+ALjA6Xu7WdUXYvUAXz5R/Yd6xgK6KIFhYi60ZmqhACimx0S9mGxu57Ky +1oa/2ebRnxO1uZrnSiByzKNwpvMEdpav2m/kt/HIvmuYzAfhCXZJZ61AHolD17Ot62/ HU7Q== X-Gm-Message-State: AKaTC036kwy30upRGrVfIKQMObeg+av5AxnRgkQeZZUVdwAuOaLZSOCzPgDosAN+x2m0Ee5N X-Received: by 10.194.0.167 with SMTP id 7mr31101023wjf.80.1480587316930; Thu, 01 Dec 2016 02:15:16 -0800 (PST) Received: from veci.piliscsaba.szeredi.hu (pool-dsl-2c-0018.externet.hu. [217.173.44.24]) by smtp.gmail.com with ESMTPSA id ab10sm77218141wjc.45.2016.12.01.02.15.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Dec 2016 02:15:16 -0800 (PST) From: Miklos Szeredi To: Al Viro Cc: linux-unionfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 8/8] Revert "ovl: Warn on copy up if a process has a R/O fd open to the lower file" Date: Thu, 1 Dec 2016 11:15:03 +0100 Message-Id: <1480587303-25088-9-git-send-email-mszeredi@redhat.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1480587303-25088-1-git-send-email-mszeredi@redhat.com> References: <1480587303-25088-1-git-send-email-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 fb5bb2c3b73df060d588b6521de5ab03589283f7. The check is no longer needed since the effected corner case is now handled correctly by overlayfs. Signed-off-by: Miklos Szeredi --- fs/overlayfs/copy_up.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c index 6c3aaf45e9cf..7bf7167ba61e 100644 --- a/fs/overlayfs/copy_up.c +++ b/fs/overlayfs/copy_up.c @@ -7,7 +7,6 @@ * the Free Software Foundation. */ -#include #include #include #include @@ -17,41 +16,10 @@ #include #include #include -#include -#include #include "overlayfs.h" #define OVL_COPY_UP_CHUNK_SIZE (1 << 20) -static bool __read_mostly ovl_check_copy_up; -module_param_named(check_copy_up, ovl_check_copy_up, bool, - S_IWUSR | S_IRUGO); -MODULE_PARM_DESC(ovl_check_copy_up, - "Warn on copy-up when causing process also has a R/O fd open"); - -static int ovl_check_fd(const void *data, struct file *f, unsigned int fd) -{ - const struct dentry *dentry = data; - - if (f->f_inode == d_inode(dentry)) - pr_warn_ratelimited("overlayfs: Warning: Copying up %pD, but open R/O on fd %u which will cease to be coherent [pid=%d %s]\n", - f, fd, current->pid, current->comm); - return 0; -} - -/* - * Check the fds open by this process and warn if something like the following - * scenario is about to occur: - * - * fd1 = open("foo", O_RDONLY); - * fd2 = open("foo", O_RDWR); - */ -static void ovl_do_check_copy_up(struct dentry *dentry) -{ - if (ovl_check_copy_up) - iterate_fd(current->files, 0, ovl_check_fd, dentry); -} - int ovl_copy_xattr(struct dentry *old, struct dentry *new) { ssize_t list_size, size, value_size = 0; @@ -339,8 +307,6 @@ int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry, if (WARN_ON(!workdir)) return -EROFS; - ovl_do_check_copy_up(lowerdentry); - ovl_path_upper(parent, &parentpath); upperdir = parentpath.dentry;