From patchwork Tue Apr 21 13:57:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emanuele Giuseppe Esposito X-Patchwork-Id: 11501491 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C2DC2913 for ; Tue, 21 Apr 2020 13:58:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A566220644 for ; Tue, 21 Apr 2020 13:58:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DZYXCXls" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728422AbgDUN6M (ORCPT ); Tue, 21 Apr 2020 09:58:12 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:49746 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728960AbgDUN6B (ORCPT ); Tue, 21 Apr 2020 09:58:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587477479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jPnP4qV6sDaGZ2bSbejYPzydlvKfgMg0o/pB9q3go8E=; b=DZYXCXlsv0fh6UE16VFVl0cTQL17cz0iEU4FclpHzRPbbxDsNK0ulE0prgaf88dYflmgiK 3IJKX8PwWmEtRTDlP8MFrLBjfCkd5YcQn7YuaP/1WW6MOCz9B2UG6Y4u9kL4okZ+tFx3HZ oRlpmP3dK7VrCKcwGhfTl34d5DD4oVs= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-244-A1ZdssvaOJWK8YtJ77g31A-1; Tue, 21 Apr 2020 09:57:55 -0400 X-MC-Unique: A1ZdssvaOJWK8YtJ77g31A-1 Received: by mail-wr1-f71.google.com with SMTP id r17so7531779wrg.19 for ; Tue, 21 Apr 2020 06:57: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:mime-version:content-transfer-encoding; bh=jPnP4qV6sDaGZ2bSbejYPzydlvKfgMg0o/pB9q3go8E=; b=PCKD6WOXDGeO5THnlvuc3Vtf6+YtSyz9qPA6oPu2EEusMIE2rDyaS/1rNhm8ey7Y+/ OhOkUGMBO13Qev2YwmLkb4/xOKKdQ/YOu76OG9urLgDDnNFdgv6GnU/ZwsxrVk4MKxmb P5cLr94QzTZDeLb1TM9HDcIrGXi9MgLCAx2e9Ioi/okP/CCwuCPOlhV7wKZ8h7HrZVF7 3nJyfJLYaBMdpFpuptgNxJ+QuJmx+CBRxgZ8BQU3mmlT/Ar689l0gzXBVmf0h6jIULCE 6tmHUBn1aUvvpFOKI/sZaC4jEpfxe/+wt0c/XObIfa/PDeRt1Bl46tEW5O+4L5e2yOEO eiKw== X-Gm-Message-State: AGi0PuZRxKIYI90TKOBbuNqC8+5z8+FC9DD3UXrsMm1gZkehRiU0JsrL 6lRCAvRxrRjizxaT1yJTI+dat6+vE8xRNhT31Fwzk3MnW1RoF1qNoDRvyPd8zDlH89/QZE7ey2Z kk7uAIuHSSRo/SuvKXc3BUhpAUVlr0zgD5hvg X-Received: by 2002:a05:600c:da:: with SMTP id u26mr5188181wmm.48.1587477474539; Tue, 21 Apr 2020 06:57:54 -0700 (PDT) X-Google-Smtp-Source: APiQypImms4WydeI5+8l3z5lWKRrEMa+0XfWFGcGeKI2hzBQZu8YXbxqfuv1YC/rok2n8KUUpE7+Vg== X-Received: by 2002:a05:600c:da:: with SMTP id u26mr5188144wmm.48.1587477474268; Tue, 21 Apr 2020 06:57:54 -0700 (PDT) Received: from localhost.localdomain.com ([194.230.155.194]) by smtp.gmail.com with ESMTPSA id f23sm3562989wml.4.2020.04.21.06.57.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 06:57:53 -0700 (PDT) From: Emanuele Giuseppe Esposito To: linux-fsdevel@vger.kernel.org Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Frederic Barrat , Andrew Donnellan , Arnd Bergmann , Greg Kroah-Hartman , "Manoj N. Kumar" , "Matthew R. Ochs" , Uma Krishnan , "James E.J. Bottomley" , "Martin K. Petersen" , Alexander Viro , Joel Becker , Christoph Hellwig , "Rafael J. Wysocki" , John Johansen , James Morris , "Serge E. Hallyn" , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-scsi@vger.kernel.org, linux-security-module@vger.kernel.org, Paolo Bonzini , Emanuele Giuseppe Esposito Subject: [PATCH v2 7/7] tracefs: switch to simplefs inode creation API Date: Tue, 21 Apr 2020 15:57:41 +0200 Message-Id: <20200421135741.30657-5-eesposit@redhat.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200421135119.30007-1-eesposit@redhat.com> References: <20200421135119.30007-1-eesposit@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: There is no semantic change intended; the code in the libfs.c functions in fact was derived from debugfs and tracefs code. Signed-off-by: Emanuele Giuseppe Esposito --- fs/tracefs/inode.c | 86 ++++------------------------------------------ 1 file changed, 7 insertions(+), 79 deletions(-) diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c index 370eb38ff1ad..bceaa4f45da2 100644 --- a/fs/tracefs/inode.c +++ b/fs/tracefs/inode.c @@ -308,57 +308,6 @@ static struct file_system_type trace_fs_type = { }; MODULE_ALIAS_FS("tracefs"); -static struct dentry *start_creating(const char *name, struct dentry *parent) -{ - struct dentry *dentry; - int error; - - pr_debug("tracefs: creating file '%s'\n",name); - - error = simple_pin_fs(&tracefs, &trace_fs_type); - if (error) - return ERR_PTR(error); - - /* If the parent is not specified, we create it in the root. - * We need the root dentry to do this, which is in the super - * block. A pointer to that is in the struct vfsmount that we - * have around. - */ - if (!parent) - parent = tracefs.mount->mnt_root; - - inode_lock(parent->d_inode); - if (unlikely(IS_DEADDIR(parent->d_inode))) - dentry = ERR_PTR(-ENOENT); - else - dentry = lookup_one_len(name, parent, strlen(name)); - if (!IS_ERR(dentry) && dentry->d_inode) { - dput(dentry); - dentry = ERR_PTR(-EEXIST); - } - - if (IS_ERR(dentry)) { - inode_unlock(parent->d_inode); - simple_release_fs(&tracefs); - } - - return dentry; -} - -static struct dentry *failed_creating(struct dentry *dentry) -{ - inode_unlock(dentry->d_parent->d_inode); - dput(dentry); - simple_release_fs(&tracefs); - return NULL; -} - -static struct dentry *end_creating(struct dentry *dentry) -{ - inode_unlock(dentry->d_parent->d_inode); - return dentry; -} - /** * tracefs_create_file - create a file in the tracefs filesystem * @name: a pointer to a string containing the name of the file to create. @@ -395,49 +344,28 @@ struct dentry *tracefs_create_file(const char *name, umode_t mode, if (security_locked_down(LOCKDOWN_TRACEFS)) return NULL; - if (!(mode & S_IFMT)) - mode |= S_IFREG; - BUG_ON(!S_ISREG(mode)); - dentry = start_creating(name, parent); - + dentry = simplefs_create_file(&tracefs, &trace_fs_type, + name, mode, parent, data, &inode); if (IS_ERR(dentry)) return NULL; - inode = tracefs_get_inode(dentry->d_sb); - if (unlikely(!inode)) - return failed_creating(dentry); - - inode->i_mode = mode; inode->i_fop = fops ? fops : &tracefs_file_operations; - inode->i_private = data; - d_instantiate(dentry, inode); - fsnotify_create(dentry->d_parent->d_inode, dentry); - return end_creating(dentry); + return simplefs_finish_dentry(dentry, inode); } static struct dentry *__create_dir(const char *name, struct dentry *parent, const struct inode_operations *ops) { - struct dentry *dentry = start_creating(name, parent); + struct dentry *dentry; struct inode *inode; + dentry = simplefs_create_dir(&tracefs, &trace_fs_type, + name, 0755, parent, &inode); if (IS_ERR(dentry)) return NULL; - inode = tracefs_get_inode(dentry->d_sb); - if (unlikely(!inode)) - return failed_creating(dentry); - - inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO; inode->i_op = ops; - inode->i_fop = &simple_dir_operations; - - /* directory inodes start off with i_nlink == 2 (for "." entry) */ - inc_nlink(inode); - d_instantiate(dentry, inode); - inc_nlink(dentry->d_parent->d_inode); - fsnotify_mkdir(dentry->d_parent->d_inode, dentry); - return end_creating(dentry); + return simplefs_finish_dentry(dentry, inode); } /**