From patchwork Tue May 29 14:41:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miklos Szeredi X-Patchwork-Id: 10435701 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 E2923602BF for ; Tue, 29 May 2018 14:43:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D318228414 for ; Tue, 29 May 2018 14:43:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7B4428446; Tue, 29 May 2018 14:43:14 +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 5B45E28414 for ; Tue, 29 May 2018 14:43:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935460AbeE2OnK (ORCPT ); Tue, 29 May 2018 10:43:10 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:37036 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935075AbeE2Ol4 (ORCPT ); Tue, 29 May 2018 10:41:56 -0400 Received: by mail-wr0-f193.google.com with SMTP id i12-v6so25987518wrc.4 for ; Tue, 29 May 2018 07:41:55 -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=bCuWMipXeZgs5EkGuZd9Du1ScYpc7/0QnEbFyewqj9c=; b=JlKyG43zekJhU91ihRV/G3m0vAXBjWv4Cs0zxfY2t02bOtuFWGGgnTGhWW7K7PWFQq ok5HBtHSLFMoymf/NsyGyhqSCh2vIkoD/U1OYBYGXqhfMXuE6Tjdkh6uZwOYuydk4CJJ hczn96zOEJCzjxdyI137uvM/BZfAuFocBu+IPDiuik8/MuGtezrPg/cnNzsYZ4DAy1J9 mjrP8ivBwtJXe8oneuKJl1V8Pn3K10SMo0cimn4zxvLPq5k3Ab9l7JEQP2ckmaAi2AB2 yn0m8xJAhwvSn7ZvuP45ioJDRK1EDcrA6nF5jY3Kh+3Fa6DSDFVUT7qnea2baW/GV0L2 Yoyw== X-Gm-Message-State: ALKqPwclQ6Pw0EaulrF1ZBXqQOFoIfIsXttF6uqunRZav7tyBVfdHXPy qLkzFZQwHq8xtuTi+TwwSrpbaXPoP3A= X-Google-Smtp-Source: ADUXVKKAsIKCCeNNHbxnXPgbkIQTQemFpvJYU7ERhz96hRv2+LwQHFdQTe1zJaLQuJrQDHUk5wY7Jw== X-Received: by 2002:adf:8bdb:: with SMTP id w27-v6mr8385226wra.169.1527604914779; Tue, 29 May 2018 07:41:54 -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 q17-v6sm12572113wmf.3.2018.05.29.07.41.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 07:41:54 -0700 (PDT) From: Miklos Szeredi To: linux-unionfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] ovl: create helper ovl_create_temp() Date: Tue, 29 May 2018 16:41:38 +0200 Message-Id: <20180529144143.16378-7-mszeredi@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180529144143.16378-1-mszeredi@redhat.com> References: <20180529144143.16378-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 From: Amir Goldstein Also used ovl_create_temp() in ovl_create_index() instead of calling ovl_do_mkdir() directly, so now all callers of ovl_do_mkdir() are routed through ovl_create_real(), which paves the way for Al's fix for non-hashed result from vfs_mkdir(). Signed-off-by: Amir Goldstein Signed-off-by: Miklos Szeredi --- fs/overlayfs/copy_up.c | 14 ++++---------- fs/overlayfs/dir.c | 13 +++++++++---- fs/overlayfs/overlayfs.h | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c index d3e9c1eeb7a4..1b442c14c531 100644 --- a/fs/overlayfs/copy_up.c +++ b/fs/overlayfs/copy_up.c @@ -365,14 +365,10 @@ static int ovl_create_index(struct dentry *dentry, struct dentry *origin, if (err) return err; - temp = ovl_lookup_temp(indexdir); + temp = ovl_create_temp(indexdir, OVL_CATTR(S_IFDIR | 0)); if (IS_ERR(temp)) goto temp_err; - err = ovl_do_mkdir(dir, temp, S_IFDIR); - if (err) - goto out; - err = ovl_set_upper_fh(upper, temp); if (err) goto out_cleanup; @@ -500,12 +496,10 @@ static int ovl_get_tmpfile(struct ovl_copy_up_ctx *c, struct dentry **tempp) if (new_creds) old_creds = override_creds(new_creds); - if (c->tmpfile) { + if (c->tmpfile) temp = ovl_do_tmpfile(c->workdir, c->stat.mode); - } else { - temp = ovl_create_real(d_inode(c->workdir), - ovl_lookup_temp(c->workdir), &cattr); - } + else + temp = ovl_create_temp(c->workdir, &cattr); if (IS_ERR(temp)) goto temp_err; err = 0; diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c index 425ddb098c4a..1b181292a624 100644 --- a/fs/overlayfs/dir.c +++ b/fs/overlayfs/dir.c @@ -43,7 +43,7 @@ int ovl_cleanup(struct inode *wdir, struct dentry *wdentry) return err; } -struct dentry *ovl_lookup_temp(struct dentry *workdir) +static struct dentry *ovl_lookup_temp(struct dentry *workdir) { struct dentry *temp; char name[20]; @@ -169,6 +169,12 @@ struct dentry *ovl_create_real(struct inode *dir, struct dentry *newdentry, return newdentry; } +struct dentry *ovl_create_temp(struct dentry *workdir, struct ovl_cattr *attr) +{ + return ovl_create_real(d_inode(workdir), ovl_lookup_temp(workdir), + attr); +} + static int ovl_set_opaque_xerr(struct dentry *dentry, struct dentry *upper, int xerr) { @@ -287,8 +293,7 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry, if (upper->d_parent->d_inode != udir) goto out_unlock; - opaquedir = ovl_create_real(wdir, ovl_lookup_temp(workdir), - OVL_CATTR(stat.mode)); + opaquedir = ovl_create_temp(workdir, OVL_CATTR(stat.mode)); err = PTR_ERR(opaquedir); if (IS_ERR(opaquedir)) goto out_unlock; @@ -388,7 +393,7 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode, if (IS_ERR(upper)) goto out_unlock; - newdentry = ovl_create_real(wdir, ovl_lookup_temp(workdir), cattr); + newdentry = ovl_create_temp(workdir, cattr); err = PTR_ERR(newdentry); if (IS_ERR(newdentry)) goto out_dput; diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h index 6bbde513e068..3f13d0965e03 100644 --- a/fs/overlayfs/overlayfs.h +++ b/fs/overlayfs/overlayfs.h @@ -346,7 +346,6 @@ static inline void ovl_copyattr(struct inode *from, struct inode *to) /* dir.c */ extern const struct inode_operations ovl_dir_inode_operations; -struct dentry *ovl_lookup_temp(struct dentry *workdir); int ovl_cleanup_and_whiteout(struct dentry *workdir, struct inode *dir, struct dentry *dentry); struct ovl_cattr { @@ -361,6 +360,7 @@ struct ovl_cattr { struct dentry *ovl_create_real(struct inode *dir, struct dentry *newdentry, struct ovl_cattr *attr); int ovl_cleanup(struct inode *dir, struct dentry *dentry); +struct dentry *ovl_create_temp(struct dentry *workdir, struct ovl_cattr *attr); /* copy_up.c */ int ovl_copy_up(struct dentry *dentry);