From patchwork Mon Apr 24 09:14:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9695877 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 83BB5601E9 for ; Mon, 24 Apr 2017 09:14:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7327728066 for ; Mon, 24 Apr 2017 09:14:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66C432810E; Mon, 24 Apr 2017 09:14:27 +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.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 EA1A028066 for ; Mon, 24 Apr 2017 09:14:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1167712AbdDXJOV (ORCPT ); Mon, 24 Apr 2017 05:14:21 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34537 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1167621AbdDXJOK (ORCPT ); Mon, 24 Apr 2017 05:14:10 -0400 Received: by mail-wm0-f65.google.com with SMTP id z129so15743537wmb.1; Mon, 24 Apr 2017 02:14:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rCl5F7ADdI8QttNyBsyYTHYoHbAXNH0Hdb+SAZx7K54=; b=e0Elom89mseKl7PNg86nbjTZvHccCTpJZPeNGS2hS7MagfY1lMdLGlQ556jJI9cWiR glWKUdUjdy7E/OJ/96Vqe5wo08lJiDyxMfhrTFewQykEBbz8AVZNM0ZGFvfj8gtsutKL cCH4JB7Vk5MAfKwy5/hzmFFghs7TdWIBf/ljXuSiLYT5u/JdxvHxljQ8VNOU1nMTbQ3J zG1TpV73jJ6FNyRt9cGJGtYNMXxoZauLyQ4rix6PUlvTuM4RLXZSat1vc2UumKXqKcmH 57P9l4Drt16OFo8A2Z052voTpT589lhIvEwYhFZIyRN+db3a+knPobgUGj4Np75Gvc1+ tibw== 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=rCl5F7ADdI8QttNyBsyYTHYoHbAXNH0Hdb+SAZx7K54=; b=UihwN1fyRrtSTtqPevJvrWxb5gAHiEWQDb85zkLMhNOBt9BB0MG0rZZK7K3SO+MZf9 bPTSVLm6mjzNP6EcKKMH8fqn/uql1FX/z/2y7C55HUjgQLtZFsnffYf3s9zc9zT1jJ6I U6l6zHvtLA+pyI2Nl52a5gFekIjDZknrN9wO032Y/lFcX9YbXyVN5BYw+c0SBwODcWRs kJQneP666cUjokWqqDKzMC2QenNZwn6Qn8cQknnqHhYUtAVAvytZgDQC8eV5xKXvGTU+ JIt4EDwgHuspqo1KfRoSaLP9CSov9eA33OOOQxXKEQdMgemy0F48hZjrGL4ETk/pmC9j ydeQ== X-Gm-Message-State: AN3rC/4XRUHNhf8Yh6Qv6C+mfseyJSUb1+1QE4feYQDzQFQypAxsYzzP sHqwh3mPFJwF+g== X-Received: by 10.28.74.70 with SMTP id x67mr8340031wma.137.1493025248812; Mon, 24 Apr 2017 02:14:08 -0700 (PDT) Received: from amir-VirtualBox.lan (bzq-79-179-55-127.red.bezeqint.net. [79.179.55.127]) by smtp.gmail.com with ESMTPSA id 187sm558375wmt.16.2017.04.24.02.14.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Apr 2017 02:14:08 -0700 (PDT) From: Amir Goldstein To: Miklos Szeredi Cc: Vivek Goyal , Al Viro , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v2 01/11] ovl: store path type in dentry Date: Mon, 24 Apr 2017 12:14:06 +0300 Message-Id: <1493025256-27188-2-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493025256-27188-1-git-send-email-amir73il@gmail.com> References: <1493025256-27188-1-git-send-email-amir73il@gmail.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 We would like to add more state info to ovl_entry soon (for const ino) and this state info would be added as type flags. Store the type value in ovl_entry and update the UPPER and MERGE type flags when needed, so ovl_path_type() just returns the stored value. Signed-off-by: Amir Goldstein --- fs/overlayfs/namei.c | 1 + fs/overlayfs/overlayfs.h | 1 + fs/overlayfs/ovl_entry.h | 3 +++ fs/overlayfs/super.c | 1 + fs/overlayfs/util.c | 30 ++++++++++++++++++++++++------ 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c index b8b0778..8788fd7 100644 --- a/fs/overlayfs/namei.c +++ b/fs/overlayfs/namei.c @@ -338,6 +338,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, kfree(stack); kfree(d.redirect); dentry->d_fsdata = oe; + ovl_update_type(dentry, d.is_dir); d_add(dentry, inode); return NULL; diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h index 741dc0b..e90a548 100644 --- a/fs/overlayfs/overlayfs.h +++ b/fs/overlayfs/overlayfs.h @@ -155,6 +155,7 @@ struct ovl_entry *ovl_alloc_entry(unsigned int numlower); bool ovl_dentry_remote(struct dentry *dentry); bool ovl_dentry_weird(struct dentry *dentry); enum ovl_path_type ovl_path_type(struct dentry *dentry); +enum ovl_path_type ovl_update_type(struct dentry *dentry, bool is_dir); void ovl_path_upper(struct dentry *dentry, struct path *path); void ovl_path_lower(struct dentry *dentry, struct path *path); enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path); diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h index 59614fa..293be5f 100644 --- a/fs/overlayfs/ovl_entry.h +++ b/fs/overlayfs/ovl_entry.h @@ -31,6 +31,8 @@ struct ovl_fs { wait_queue_head_t copyup_wq; }; +enum ovl_path_type; + /* private information held for every overlayfs dentry */ struct ovl_entry { struct dentry *__upperdentry; @@ -44,6 +46,7 @@ struct ovl_entry { }; struct rcu_head rcu; }; + enum ovl_path_type __type; unsigned numlower; struct path lowerstack[]; }; diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index c072a0c..671bac0 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -961,6 +961,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) kfree(stack); root_dentry->d_fsdata = oe; + ovl_update_type(root_dentry, true); realinode = d_inode(ovl_dentry_real(root_dentry)); ovl_inode_init(d_inode(root_dentry), realinode, !!upperpath.dentry); diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index 1953986..6a857fb 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -70,21 +70,38 @@ bool ovl_dentry_weird(struct dentry *dentry) enum ovl_path_type ovl_path_type(struct dentry *dentry) { struct ovl_entry *oe = dentry->d_fsdata; - enum ovl_path_type type = 0; + enum ovl_path_type type = oe->__type; - if (oe->__upperdentry) { - type = __OVL_PATH_UPPER; + /* Matches smp_wmb() in ovl_update_type() */ + smp_rmb(); + return type; +} + +enum ovl_path_type ovl_update_type(struct dentry *dentry, bool is_dir) +{ + struct ovl_entry *oe = dentry->d_fsdata; + enum ovl_path_type type = oe->__type; + /* Update UPPER/MERGE flags and preserve the rest */ + type &= ~(__OVL_PATH_UPPER | __OVL_PATH_MERGE); + if (oe->__upperdentry) { + type |= __OVL_PATH_UPPER; /* - * Non-dir dentry can hold lower dentry from previous - * location. + * Non-dir dentry can hold lower dentry from before + * copy-up. */ - if (oe->numlower && d_is_dir(dentry)) + if (oe->numlower && is_dir) type |= __OVL_PATH_MERGE; } else { if (oe->numlower > 1) type |= __OVL_PATH_MERGE; } + /* + * Make sure type is consistent with __upperdentry before making it + * visible to ovl_path_type(). + */ + smp_wmb(); + oe->__type = type; return type; } @@ -220,6 +237,7 @@ void ovl_dentry_update(struct dentry *dentry, struct dentry *upperdentry) */ smp_wmb(); oe->__upperdentry = upperdentry; + ovl_update_type(dentry, d_is_dir(dentry)); } void ovl_inode_init(struct inode *inode, struct inode *realinode, bool is_upper)