From mboxrd@z Thu Jan 1 00:00:00 1970 From: Emanuele Giuseppe Esposito Subject: [PATCH 6/8] simplefs: add file creation functions Date: Tue, 14 Apr 2020 14:43:00 +0200 Message-ID: <20200414124304.4470-7-eesposit@redhat.com> References: <20200414124304.4470-1-eesposit@redhat.com> Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586868262; 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=SkKDvUy87926CmAT32HsWjLbIxTbOhqOTHC/vd3O4C0=; b=hAZxlAFxPLBTZ0dZUK4vWmZD8OQC0vEPD1D5Ti07Q295SOclUBU1cdsylWqNDhd+afa7Zu /u0YipRUapWRy/lzMPbv29GK625zc6Eh844BSGMWWkdJMS8daFK6z7+22pgPttM9KCJ0JA /VATwRhULj47dLjREHC+wvgoL2712WI= In-Reply-To: <20200414124304.4470-1-eesposit@redhat.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane-mx.org@lists.ozlabs.org Sender: "Linuxppc-dev" Content-Type: text/plain; charset="us-ascii" To: linux-nfs@vger.kernel.org Cc: Song Liu , linux-usb@vger.kernel.org, bpf@vger.kernel.org, "Rafael J. Wysocki" , David Airlie , Heiko Carstens , Alexei Starovoitov , dri-devel@lists.freedesktop.org, "J. Bruce Fields" , Joseph Qi , Hugh Dickins , Paul Mackerras , John Johansen , netdev@vger.kernel.org, linux-s390@vger.kernel.org, Christoph Hellwig , Andrew Donnellan , Emanuele Giuseppe Esposito , Matthew Garrett , linux-efi@vger.kernel.org, Arnd Bergmann , Daniel Borkmann , Christian Borntraeger , linux-rdma@vger.kernel.org, Mark Fasheh A bunch of code is duplicated between debugfs and tracefs, unify it to the simplefs library. The code is very similar, except that dentry and inode creation are unified into a single function (unlike start_creating in debugfs and tracefs, which only takes care of dentries). This adds an output parameter to the creatio= n functions, but pushes all error recovery into fs/simplefs.c. Signed-off-by: Emanuele Giuseppe Esposito --- fs/simplefs.c | 150 +++++++++++++++++++++++++++++++++++++++ include/linux/simplefs.h | 19 +++++ 2 files changed, 169 insertions(+) diff --git a/fs/simplefs.c b/fs/simplefs.c index c59eb8d996be..3e48a288beb3 100644 --- a/fs/simplefs.c +++ b/fs/simplefs.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include #include +#include +#include =20 static DEFINE_SPINLOCK(pin_fs_lock); =20 @@ -42,3 +44,151 @@ struct inode *simple_alloc_anon_inode(struct simple_fs = *fs) =09return alloc_anon_inode(fs->mount->mnt_sb); } EXPORT_SYMBOL(simple_alloc_anon_inode); + +static struct dentry *failed_creating(struct simple_fs *fs, struct dentry = *dentry) +{ +=09inode_unlock(d_inode(dentry->d_parent)); +=09dput(dentry); +=09simple_release_fs(fs); +=09return ERR_PTR(-ENOMEM); +} + +struct dentry *simplefs_create_dentry(struct simple_fs *fs, struct file_sy= stem_type *type, +=09=09=09=09 const char *name, struct dentry *parent, +=09=09=09=09 struct inode **inode) +{ +=09struct dentry *dentry; +=09int error; + +=09pr_debug("creating file '%s'\n", name); + +=09if (IS_ERR(parent)) +=09=09return parent; + +=09error =3D simple_pin_fs(fs, type); +=09if (error) { +=09=09pr_err("Unable to pin filesystem for file '%s'\n", name); +=09=09return ERR_PTR(error); +=09} + +=09/* If the parent is not specified, we create it in the root. +=09 * We need the root dentry to do this, which is in the super +=09 * block. A pointer to that is in the struct vfsmount that we +=09 * have around. +=09 */ +=09if (!parent) +=09=09parent =3D fs->mount->mnt_root; + +=09inode_lock(d_inode(parent)); +=09dentry =3D lookup_one_len(name, parent, strlen(name)); +=09if (!IS_ERR(dentry) && d_really_is_positive(dentry)) { +=09=09if (d_is_dir(dentry)) +=09=09=09pr_err("Directory '%s' with parent '%s' already present!\n", +=09=09=09 name, parent->d_name.name); +=09=09else +=09=09=09pr_err("File '%s' in directory '%s' already present!\n", +=09=09=09 name, parent->d_name.name); +=09=09dput(dentry); +=09=09dentry =3D ERR_PTR(-EEXIST); +=09} + +=09if (IS_ERR(dentry)) { +=09=09inode_unlock(d_inode(parent)); +=09=09simple_release_fs(fs); +=09} + + +=09if (IS_ERR(dentry)) +=09=09return dentry; + +=09*inode =3D simple_new_inode(fs->mount->mnt_sb); +=09if (unlikely(!(*inode))) { +=09=09pr_err("out of free inodes, can not create file '%s'\n", +=09=09 name); +=09=09return failed_creating(fs, dentry); +=09} + +=09return dentry; +} +EXPORT_SYMBOL(simplefs_create_dentry); + +struct dentry *simplefs_create_file(struct simple_fs *fs, struct file_syst= em_type *type, +=09=09=09=09 const char *name, umode_t mode, +=09=09=09=09 struct dentry *parent, void *data, +=09=09=09=09 struct inode **inode) +{ +=09struct dentry *dentry; + +=09WARN_ON((mode & S_IFMT) && !S_ISREG(mode)); +=09mode |=3D S_IFREG; + +=09dentry =3D simplefs_create_dentry(fs, type, name, parent, inode); + +=09if (IS_ERR(dentry)) +=09=09return dentry; + +=09(*inode)->i_mode =3D mode; +=09(*inode)->i_private =3D data; + +=09return dentry; +} +EXPORT_SYMBOL(simplefs_create_file); + +struct dentry *simplefs_finish_dentry(struct dentry *dentry, struct inode = *inode) +{ +=09d_instantiate(dentry, inode); +=09if (S_ISDIR(inode->i_mode)) { +=09=09inc_nlink(d_inode(dentry->d_parent)); +=09=09fsnotify_mkdir(d_inode(dentry->d_parent), dentry); +=09} else { +=09=09fsnotify_create(d_inode(dentry->d_parent), dentry); +=09} +=09inode_unlock(d_inode(dentry->d_parent)); +=09return dentry; +} +EXPORT_SYMBOL(simplefs_finish_dentry); + +struct dentry *simplefs_create_dir(struct simple_fs *fs, struct file_syste= m_type *type, +=09=09=09=09 const char *name, umode_t mode, struct dentry *parent, +=09=09=09=09 struct inode **inode) +{ +=09struct dentry *dentry; + +=09WARN_ON((mode & S_IFMT) && !S_ISDIR(mode)); +=09mode |=3D S_IFDIR; + +=09dentry =3D simplefs_create_dentry(fs, type, name, parent, inode); +=09if (IS_ERR(dentry)) +=09=09return dentry; + +=09(*inode)->i_mode =3D mode; +=09(*inode)->i_op =3D &simple_dir_inode_operations; +=09(*inode)->i_fop =3D &simple_dir_operations; + +=09/* directory inodes start off with i_nlink =3D=3D 2 (for "." entry) */ +=09inc_nlink(*inode); +=09return dentry; +} +EXPORT_SYMBOL(simplefs_create_dir); + +struct dentry *simplefs_create_symlink(struct simple_fs *fs, struct file_s= ystem_type *type, +=09=09=09=09 const char *name, struct dentry *parent, +=09=09=09=09 const char *target, struct inode **inode) +{ +=09struct dentry *dentry; +=09char *link =3D kstrdup(target, GFP_KERNEL); +=09if (!link) +=09=09return ERR_PTR(-ENOMEM); + +=09dentry =3D simplefs_create_dentry(fs, type, name, parent, inode); +=09if (IS_ERR(dentry)) { +=09=09kfree_link(link); +=09=09return dentry; +=09} + +=09(*inode)->i_mode =3D S_IFLNK | S_IRWXUGO; +=09(*inode)->i_link =3D link; +=09(*inode)->i_op =3D &simple_symlink_inode_operations; +=09return dentry; +} +EXPORT_SYMBOL(simplefs_create_symlink); diff --git a/include/linux/simplefs.h b/include/linux/simplefs.h index c62ab526414e..cc53eed0bc3d 100644 --- a/include/linux/simplefs.h +++ b/include/linux/simplefs.h @@ -14,4 +14,23 @@ extern void simple_release_fs(struct simple_fs *); =20 extern struct inode *simple_alloc_anon_inode(struct simple_fs *fs); =20 +extern struct dentry *simplefs_create_dentry(struct simple_fs *fs, +=09=09=09=09=09 struct file_system_type *type, +=09=09=09=09=09 const char *name, struct dentry *parent, +=09=09=09=09=09 struct inode **inode); +struct dentry *simplefs_finish_dentry(struct dentry *dentry, struct inode = *inode); + +extern struct dentry *simplefs_create_file(struct simple_fs *fs, +=09=09=09=09=09 struct file_system_type *type, +=09=09=09=09=09 const char *name, umode_t mode, +=09=09=09=09=09 struct dentry *parent, void *data, +=09=09=09=09=09 struct inode **inode); +extern struct dentry *simplefs_create_dir(struct simple_fs *fs, struct fil= e_system_type *type, +=09=09=09=09=09 const char *name, umode_t mode, struct dentry *parent, +=09=09=09=09=09 struct inode **inode); +extern struct dentry *simplefs_create_symlink(struct simple_fs *fs, struct= file_system_type *type, +=09=09=09=09=09 const char *name, struct dentry *parent, +=09=09=09=09=09 const char *target, struct inode **inode); + + #endif --=20 2.25.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Emanuele Giuseppe Esposito Date: Tue, 14 Apr 2020 14:43:00 +0200 Subject: [Ocfs2-devel] [PATCH 6/8] simplefs: add file creation functions In-Reply-To: <20200414124304.4470-1-eesposit@redhat.com> References: <20200414124304.4470-1-eesposit@redhat.com> Message-ID: <20200414124304.4470-7-eesposit@redhat.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-nfs@vger.kernel.org Cc: Song Liu , linux-usb@vger.kernel.org, bpf@vger.kernel.org, "Rafael J. Wysocki" , David Airlie , Heiko Carstens , Alexei Starovoitov , dri-devel@lists.freedesktop.org, "J. Bruce Fields" , Joseph Qi , Hugh Dickins , Paul Mackerras , John Johansen , linux-s390@vger.kernel.org, Christoph Hellwig , Andrew Donnellan , Emanuele Giuseppe Esposito , Matthew Garrett , linux-efi@vger.kernel.org, Arnd Bergmann , Daniel Borkmann , Christian Borntraeger , linux-rdma@vger.kernel.org, Michael Ellerman , Mark Fasheh , Anton Vorontsov , John Fastabend , James Morris , Ard Biesheuvel , Jason Gunthorpe , Doug Ledford , oprofile-list@lists.sf.net, Yonghong Song , Ian Kent , Andrii Nakryiko , Alexey Dobriyan , "Serge E. Hallyn" , netdev@vger.kernel.org, Robert Richter , Thomas Zimmermann , Vasily Gorbik , Tony Luck , Kees Cook , "James E.J. Bottomley" , autofs@vger.kernel.org, Uma Krishnan , linux-fsdevel@vger.kernel.org, "Manoj N. Kumar" , Alexander Viro , Jakub Kicinski , KP Singh , Trond Myklebust , "Matthew R. Ochs" , "David S. Miller" , Felipe Balbi , Mike Marciniszyn , Iurii Zaikin , linux-scsi@vger.kernel.org, "Martin K. Petersen" , linux-mm@kvack.org, Greg Kroah-Hartman , Dennis Dalessandro , Miklos Szeredi , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Anna Schumaker , Luis Chamberlain , Chuck Lever , Jeremy Kerr , Colin Cross , Frederic Barrat , Paolo Bonzini , Andrew Morton , Mike Kravetz , linuxppc-dev@lists.ozlabs.org, Martin KaFai Lau , ocfs2-devel@oss.oracle.com, Joel Becker A bunch of code is duplicated between debugfs and tracefs, unify it to the simplefs library. The code is very similar, except that dentry and inode creation are unified into a single function (unlike start_creating in debugfs and tracefs, which only takes care of dentries). This adds an output parameter to the creation functions, but pushes all error recovery into fs/simplefs.c. Signed-off-by: Emanuele Giuseppe Esposito --- fs/simplefs.c | 150 +++++++++++++++++++++++++++++++++++++++ include/linux/simplefs.h | 19 +++++ 2 files changed, 169 insertions(+) diff --git a/fs/simplefs.c b/fs/simplefs.c index c59eb8d996be..3e48a288beb3 100644 --- a/fs/simplefs.c +++ b/fs/simplefs.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include #include +#include +#include static DEFINE_SPINLOCK(pin_fs_lock); @@ -42,3 +44,151 @@ struct inode *simple_alloc_anon_inode(struct simple_fs *fs) return alloc_anon_inode(fs->mount->mnt_sb); } EXPORT_SYMBOL(simple_alloc_anon_inode); + +static struct dentry *failed_creating(struct simple_fs *fs, struct dentry *dentry) +{ + inode_unlock(d_inode(dentry->d_parent)); + dput(dentry); + simple_release_fs(fs); + return ERR_PTR(-ENOMEM); +} + +struct dentry *simplefs_create_dentry(struct simple_fs *fs, struct file_system_type *type, + const char *name, struct dentry *parent, + struct inode **inode) +{ + struct dentry *dentry; + int error; + + pr_debug("creating file '%s'\n", name); + + if (IS_ERR(parent)) + return parent; + + error = simple_pin_fs(fs, type); + if (error) { + pr_err("Unable to pin filesystem for file '%s'\n", name); + 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 = fs->mount->mnt_root; + + inode_lock(d_inode(parent)); + dentry = lookup_one_len(name, parent, strlen(name)); + if (!IS_ERR(dentry) && d_really_is_positive(dentry)) { + if (d_is_dir(dentry)) + pr_err("Directory '%s' with parent '%s' already present!\n", + name, parent->d_name.name); + else + pr_err("File '%s' in directory '%s' already present!\n", + name, parent->d_name.name); + dput(dentry); + dentry = ERR_PTR(-EEXIST); + } + + if (IS_ERR(dentry)) { + inode_unlock(d_inode(parent)); + simple_release_fs(fs); + } + + + if (IS_ERR(dentry)) + return dentry; + + *inode = simple_new_inode(fs->mount->mnt_sb); + if (unlikely(!(*inode))) { + pr_err("out of free inodes, can not create file '%s'\n", + name); + return failed_creating(fs, dentry); + } + + return dentry; +} +EXPORT_SYMBOL(simplefs_create_dentry); + +struct dentry *simplefs_create_file(struct simple_fs *fs, struct file_system_type *type, + const char *name, umode_t mode, + struct dentry *parent, void *data, + struct inode **inode) +{ + struct dentry *dentry; + + WARN_ON((mode & S_IFMT) && !S_ISREG(mode)); + mode |= S_IFREG; + + dentry = simplefs_create_dentry(fs, type, name, parent, inode); + + if (IS_ERR(dentry)) + return dentry; + + (*inode)->i_mode = mode; + (*inode)->i_private = data; + + return dentry; +} +EXPORT_SYMBOL(simplefs_create_file); + +struct dentry *simplefs_finish_dentry(struct dentry *dentry, struct inode *inode) +{ + d_instantiate(dentry, inode); + if (S_ISDIR(inode->i_mode)) { + inc_nlink(d_inode(dentry->d_parent)); + fsnotify_mkdir(d_inode(dentry->d_parent), dentry); + } else { + fsnotify_create(d_inode(dentry->d_parent), dentry); + } + inode_unlock(d_inode(dentry->d_parent)); + return dentry; +} +EXPORT_SYMBOL(simplefs_finish_dentry); + +struct dentry *simplefs_create_dir(struct simple_fs *fs, struct file_system_type *type, + const char *name, umode_t mode, struct dentry *parent, + struct inode **inode) +{ + struct dentry *dentry; + + WARN_ON((mode & S_IFMT) && !S_ISDIR(mode)); + mode |= S_IFDIR; + + dentry = simplefs_create_dentry(fs, type, name, parent, inode); + if (IS_ERR(dentry)) + return dentry; + + (*inode)->i_mode = mode; + (*inode)->i_op = &simple_dir_inode_operations; + (*inode)->i_fop = &simple_dir_operations; + + /* directory inodes start off with i_nlink == 2 (for "." entry) */ + inc_nlink(*inode); + return dentry; +} +EXPORT_SYMBOL(simplefs_create_dir); + +struct dentry *simplefs_create_symlink(struct simple_fs *fs, struct file_system_type *type, + const char *name, struct dentry *parent, + const char *target, struct inode **inode) +{ + struct dentry *dentry; + char *link = kstrdup(target, GFP_KERNEL); + if (!link) + return ERR_PTR(-ENOMEM); + + dentry = simplefs_create_dentry(fs, type, name, parent, inode); + if (IS_ERR(dentry)) { + kfree_link(link); + return dentry; + } + + (*inode)->i_mode = S_IFLNK | S_IRWXUGO; + (*inode)->i_link = link; + (*inode)->i_op = &simple_symlink_inode_operations; + return dentry; +} +EXPORT_SYMBOL(simplefs_create_symlink); diff --git a/include/linux/simplefs.h b/include/linux/simplefs.h index c62ab526414e..cc53eed0bc3d 100644 --- a/include/linux/simplefs.h +++ b/include/linux/simplefs.h @@ -14,4 +14,23 @@ extern void simple_release_fs(struct simple_fs *); extern struct inode *simple_alloc_anon_inode(struct simple_fs *fs); +extern struct dentry *simplefs_create_dentry(struct simple_fs *fs, + struct file_system_type *type, + const char *name, struct dentry *parent, + struct inode **inode); +struct dentry *simplefs_finish_dentry(struct dentry *dentry, struct inode *inode); + +extern struct dentry *simplefs_create_file(struct simple_fs *fs, + struct file_system_type *type, + const char *name, umode_t mode, + struct dentry *parent, void *data, + struct inode **inode); +extern struct dentry *simplefs_create_dir(struct simple_fs *fs, struct file_system_type *type, + const char *name, umode_t mode, struct dentry *parent, + struct inode **inode); +extern struct dentry *simplefs_create_symlink(struct simple_fs *fs, struct file_system_type *type, + const char *name, struct dentry *parent, + const char *target, struct inode **inode); + + #endif -- 2.25.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 696DFC2BB86 for ; Tue, 14 Apr 2020 13:18:09 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E1E2A2063A for ; Tue, 14 Apr 2020 13:18:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hAZxlAFx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1E2A2063A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 491mJF6SZ0zDq96 for ; Tue, 14 Apr 2020 23:18:05 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=redhat.com (client-ip=207.211.31.81; helo=us-smtp-delivery-1.mimecast.com; envelope-from=eesposit@redhat.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hAZxlAFx; dkim-atps=neutral Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 491lYP4VRwzDq5y for ; Tue, 14 Apr 2020 22:44:25 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586868262; 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=SkKDvUy87926CmAT32HsWjLbIxTbOhqOTHC/vd3O4C0=; b=hAZxlAFxPLBTZ0dZUK4vWmZD8OQC0vEPD1D5Ti07Q295SOclUBU1cdsylWqNDhd+afa7Zu /u0YipRUapWRy/lzMPbv29GK625zc6Eh844BSGMWWkdJMS8daFK6z7+22pgPttM9KCJ0JA /VATwRhULj47dLjREHC+wvgoL2712WI= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-141-Yn2H88NHPyelaApDUsWzXQ-1; Tue, 14 Apr 2020 08:44:19 -0400 X-MC-Unique: Yn2H88NHPyelaApDUsWzXQ-1 Received: by mail-wm1-f72.google.com with SMTP id o26so3721928wmh.1 for ; Tue, 14 Apr 2020 05:44:18 -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=sI5vxC1ZvKgnSHwtEppycudchqTAWMoyZNsGMD6XBfs=; b=oxia/4868gUqchu6k2hgMxjpmVZP2QIs65njmFqB4TrMmrFjWelVOcbyMgfmrD20Ug Z9jse71d19+2oQpj+b8l2hfd8Bfomnq6ZgcQ3EYRkbGKxOGHML8Pxzd+XfW796c+A1l9 gRpAX2v5eMe7ZYo29/SCyncRO9oV9PTf0BPfqmyWqMbKMmgOvW0l+eQo0j3LvgdVzBQk AdWB080poLiTIBXYOg73uaaQ4T8FLXe3TdQqOa1DCNoiFPhCX2e2HkKvXqLyxqSDnV7O 84EKPvLTI4OjvSS0isycBB8HVyn1WYT6PR9JkU5y6BAoRxyBkNuAQBP7rq47UYljcU+g PV+g== X-Gm-Message-State: AGi0Pubp72kBH/drMgoSGsphfIqyDYxT23LCIPmL8uzbv6SxAap/IPWR RpY/sGj4gm75pjAUeVSm+LOYw8Uu9sdWVfqyHfLIRYSDTcAEd/2MLfGTw7rIImRq+bWAQ7UrrVW v7FFjEaW7gqrxWm+9lbi7IgU5Bw== X-Received: by 2002:a1c:147:: with SMTP id 68mr24228936wmb.28.1586868257524; Tue, 14 Apr 2020 05:44:17 -0700 (PDT) X-Google-Smtp-Source: APiQypJ6wN8g3wQLLN2KDP/D/IgWf7DatiJ17rYX27xAXjxyuMyzqvoWzXAAA6WPVEIYS0CMkz6Yow== X-Received: by 2002:a1c:147:: with SMTP id 68mr24228852wmb.28.1586868257170; Tue, 14 Apr 2020 05:44:17 -0700 (PDT) Received: from localhost.localdomain ([194.230.155.210]) by smtp.gmail.com with ESMTPSA id m14sm16948816wrs.76.2020.04.14.05.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 05:44:16 -0700 (PDT) From: Emanuele Giuseppe Esposito To: linux-nfs@vger.kernel.org Subject: [PATCH 6/8] simplefs: add file creation functions Date: Tue, 14 Apr 2020 14:43:00 +0200 Message-Id: <20200414124304.4470-7-eesposit@redhat.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200414124304.4470-1-eesposit@redhat.com> References: <20200414124304.4470-1-eesposit@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Mailman-Approved-At: Tue, 14 Apr 2020 22:51:50 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Song Liu , linux-usb@vger.kernel.org, bpf@vger.kernel.org, "Rafael J. Wysocki" , David Airlie , Heiko Carstens , Alexei Starovoitov , dri-devel@lists.freedesktop.org, "J. Bruce Fields" , Joseph Qi , Hugh Dickins , Paul Mackerras , John Johansen , netdev@vger.kernel.org, linux-s390@vger.kernel.org, Christoph Hellwig , Andrew Donnellan , Emanuele Giuseppe Esposito , Matthew Garrett , linux-efi@vger.kernel.org, Arnd Bergmann , Daniel Borkmann , Christian Borntraeger , linux-rdma@vger.kernel.org, Mark Fasheh , Anton Vorontsov , John Fastabend , James Morris , Ard Biesheuvel , Jason Gunthorpe , Doug Ledford , oprofile-list@lists.sf.net, Yonghong Song , Ian Kent , Andrii Nakryiko , Alexey Dobriyan , "Serge E. Hallyn" , Robert Richter , Thomas Zimmermann , Vasily Gorbik , Tony Luck , Kees Cook , "James E.J. Bottomley" , autofs@vger.kernel.org, Maarten Lankhorst , Uma Krishnan , Maxime Ripard , linux-fsdevel@vger.kernel.org, "Manoj N. Kumar" , Alexander Viro , Jakub Kicinski , KP Singh , Trond Myklebust , "Matthew R. Ochs" , "David S. Miller" , Felipe Balbi , Mike Marciniszyn , Iurii Zaikin , linux-scsi@vger.kernel.org, "Martin K. Petersen" , linux-mm@kvack.org, Greg Kroah-Hartman , Dennis Dalessandro , Miklos Szeredi , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Anna Schumaker , Luis Chamberlain , Chuck Lever , Jeremy Kerr , Daniel Vetter , Colin Cross , Frederic Barrat , Paolo Bonzini , Andrew Morton , Mike Kravetz , linuxppc-dev@lists.ozlabs.org, Martin KaFai Lau , ocfs2-devel@oss.oracle.com, Joel Becker Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" A bunch of code is duplicated between debugfs and tracefs, unify it to the simplefs library. The code is very similar, except that dentry and inode creation are unified into a single function (unlike start_creating in debugfs and tracefs, which only takes care of dentries). This adds an output parameter to the creatio= n functions, but pushes all error recovery into fs/simplefs.c. Signed-off-by: Emanuele Giuseppe Esposito --- fs/simplefs.c | 150 +++++++++++++++++++++++++++++++++++++++ include/linux/simplefs.h | 19 +++++ 2 files changed, 169 insertions(+) diff --git a/fs/simplefs.c b/fs/simplefs.c index c59eb8d996be..3e48a288beb3 100644 --- a/fs/simplefs.c +++ b/fs/simplefs.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include #include +#include +#include =20 static DEFINE_SPINLOCK(pin_fs_lock); =20 @@ -42,3 +44,151 @@ struct inode *simple_alloc_anon_inode(struct simple_fs = *fs) =09return alloc_anon_inode(fs->mount->mnt_sb); } EXPORT_SYMBOL(simple_alloc_anon_inode); + +static struct dentry *failed_creating(struct simple_fs *fs, struct dentry = *dentry) +{ +=09inode_unlock(d_inode(dentry->d_parent)); +=09dput(dentry); +=09simple_release_fs(fs); +=09return ERR_PTR(-ENOMEM); +} + +struct dentry *simplefs_create_dentry(struct simple_fs *fs, struct file_sy= stem_type *type, +=09=09=09=09 const char *name, struct dentry *parent, +=09=09=09=09 struct inode **inode) +{ +=09struct dentry *dentry; +=09int error; + +=09pr_debug("creating file '%s'\n", name); + +=09if (IS_ERR(parent)) +=09=09return parent; + +=09error =3D simple_pin_fs(fs, type); +=09if (error) { +=09=09pr_err("Unable to pin filesystem for file '%s'\n", name); +=09=09return ERR_PTR(error); +=09} + +=09/* If the parent is not specified, we create it in the root. +=09 * We need the root dentry to do this, which is in the super +=09 * block. A pointer to that is in the struct vfsmount that we +=09 * have around. +=09 */ +=09if (!parent) +=09=09parent =3D fs->mount->mnt_root; + +=09inode_lock(d_inode(parent)); +=09dentry =3D lookup_one_len(name, parent, strlen(name)); +=09if (!IS_ERR(dentry) && d_really_is_positive(dentry)) { +=09=09if (d_is_dir(dentry)) +=09=09=09pr_err("Directory '%s' with parent '%s' already present!\n", +=09=09=09 name, parent->d_name.name); +=09=09else +=09=09=09pr_err("File '%s' in directory '%s' already present!\n", +=09=09=09 name, parent->d_name.name); +=09=09dput(dentry); +=09=09dentry =3D ERR_PTR(-EEXIST); +=09} + +=09if (IS_ERR(dentry)) { +=09=09inode_unlock(d_inode(parent)); +=09=09simple_release_fs(fs); +=09} + + +=09if (IS_ERR(dentry)) +=09=09return dentry; + +=09*inode =3D simple_new_inode(fs->mount->mnt_sb); +=09if (unlikely(!(*inode))) { +=09=09pr_err("out of free inodes, can not create file '%s'\n", +=09=09 name); +=09=09return failed_creating(fs, dentry); +=09} + +=09return dentry; +} +EXPORT_SYMBOL(simplefs_create_dentry); + +struct dentry *simplefs_create_file(struct simple_fs *fs, struct file_syst= em_type *type, +=09=09=09=09 const char *name, umode_t mode, +=09=09=09=09 struct dentry *parent, void *data, +=09=09=09=09 struct inode **inode) +{ +=09struct dentry *dentry; + +=09WARN_ON((mode & S_IFMT) && !S_ISREG(mode)); +=09mode |=3D S_IFREG; + +=09dentry =3D simplefs_create_dentry(fs, type, name, parent, inode); + +=09if (IS_ERR(dentry)) +=09=09return dentry; + +=09(*inode)->i_mode =3D mode; +=09(*inode)->i_private =3D data; + +=09return dentry; +} +EXPORT_SYMBOL(simplefs_create_file); + +struct dentry *simplefs_finish_dentry(struct dentry *dentry, struct inode = *inode) +{ +=09d_instantiate(dentry, inode); +=09if (S_ISDIR(inode->i_mode)) { +=09=09inc_nlink(d_inode(dentry->d_parent)); +=09=09fsnotify_mkdir(d_inode(dentry->d_parent), dentry); +=09} else { +=09=09fsnotify_create(d_inode(dentry->d_parent), dentry); +=09} +=09inode_unlock(d_inode(dentry->d_parent)); +=09return dentry; +} +EXPORT_SYMBOL(simplefs_finish_dentry); + +struct dentry *simplefs_create_dir(struct simple_fs *fs, struct file_syste= m_type *type, +=09=09=09=09 const char *name, umode_t mode, struct dentry *parent, +=09=09=09=09 struct inode **inode) +{ +=09struct dentry *dentry; + +=09WARN_ON((mode & S_IFMT) && !S_ISDIR(mode)); +=09mode |=3D S_IFDIR; + +=09dentry =3D simplefs_create_dentry(fs, type, name, parent, inode); +=09if (IS_ERR(dentry)) +=09=09return dentry; + +=09(*inode)->i_mode =3D mode; +=09(*inode)->i_op =3D &simple_dir_inode_operations; +=09(*inode)->i_fop =3D &simple_dir_operations; + +=09/* directory inodes start off with i_nlink =3D=3D 2 (for "." entry) */ +=09inc_nlink(*inode); +=09return dentry; +} +EXPORT_SYMBOL(simplefs_create_dir); + +struct dentry *simplefs_create_symlink(struct simple_fs *fs, struct file_s= ystem_type *type, +=09=09=09=09 const char *name, struct dentry *parent, +=09=09=09=09 const char *target, struct inode **inode) +{ +=09struct dentry *dentry; +=09char *link =3D kstrdup(target, GFP_KERNEL); +=09if (!link) +=09=09return ERR_PTR(-ENOMEM); + +=09dentry =3D simplefs_create_dentry(fs, type, name, parent, inode); +=09if (IS_ERR(dentry)) { +=09=09kfree_link(link); +=09=09return dentry; +=09} + +=09(*inode)->i_mode =3D S_IFLNK | S_IRWXUGO; +=09(*inode)->i_link =3D link; +=09(*inode)->i_op =3D &simple_symlink_inode_operations; +=09return dentry; +} +EXPORT_SYMBOL(simplefs_create_symlink); diff --git a/include/linux/simplefs.h b/include/linux/simplefs.h index c62ab526414e..cc53eed0bc3d 100644 --- a/include/linux/simplefs.h +++ b/include/linux/simplefs.h @@ -14,4 +14,23 @@ extern void simple_release_fs(struct simple_fs *); =20 extern struct inode *simple_alloc_anon_inode(struct simple_fs *fs); =20 +extern struct dentry *simplefs_create_dentry(struct simple_fs *fs, +=09=09=09=09=09 struct file_system_type *type, +=09=09=09=09=09 const char *name, struct dentry *parent, +=09=09=09=09=09 struct inode **inode); +struct dentry *simplefs_finish_dentry(struct dentry *dentry, struct inode = *inode); + +extern struct dentry *simplefs_create_file(struct simple_fs *fs, +=09=09=09=09=09 struct file_system_type *type, +=09=09=09=09=09 const char *name, umode_t mode, +=09=09=09=09=09 struct dentry *parent, void *data, +=09=09=09=09=09 struct inode **inode); +extern struct dentry *simplefs_create_dir(struct simple_fs *fs, struct fil= e_system_type *type, +=09=09=09=09=09 const char *name, umode_t mode, struct dentry *parent, +=09=09=09=09=09 struct inode **inode); +extern struct dentry *simplefs_create_symlink(struct simple_fs *fs, struct= file_system_type *type, +=09=09=09=09=09 const char *name, struct dentry *parent, +=09=09=09=09=09 const char *target, struct inode **inode); + + #endif --=20 2.25.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30C75C2BB86 for ; Tue, 14 Apr 2020 12:44:23 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0629320768 for ; Tue, 14 Apr 2020 12:44:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PPRVY0//" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0629320768 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8F9DB6E0EF; Tue, 14 Apr 2020 12:44:22 +0000 (UTC) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4541F6E0EF for ; Tue, 14 Apr 2020 12:44:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586868260; 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=SkKDvUy87926CmAT32HsWjLbIxTbOhqOTHC/vd3O4C0=; b=PPRVY0//R7+wGy76PFqhvcL4eN1VmoAGOXLH5cDTGEDWxHXQ+hPjU+LAhKLskfW+LtHLD3 WUUj2HQvr5t8j+l3kuY3OGatGa82lBUKCMDW2ccywZJoZDEk1xvJ18IHt89wSOUBK+U1f0 qWLA11+kzEtLwogQQ0PmThWG9N8NsLs= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-400-AcWc4FX4PLug9zCttlQTng-1; Tue, 14 Apr 2020 08:44:19 -0400 X-MC-Unique: AcWc4FX4PLug9zCttlQTng-1 Received: by mail-wm1-f72.google.com with SMTP id c196so1794362wmd.3 for ; Tue, 14 Apr 2020 05:44:18 -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=sI5vxC1ZvKgnSHwtEppycudchqTAWMoyZNsGMD6XBfs=; b=apgvbbtQIFRYHXUKNnU9aFgAyZUUMB6kBj8+XgUFtfwKShkdmRPVMwk16GfQW1d9qv yHjJpNktdED9n3BmcuIJ0v9T68FR6df/tuBY2bTMQOCfymDno+BZbpXfMIPcx5SL633b puaQGHaXtj5Lv7Oo9wPYMzqJf9u+F44o6g3r7nuw4LeAGZQ+12geqHsn5gTKTOWLVCEI gEMB5IeZh4eV3CVF/pwfQBEonqe23YYDg53Zt7zkWX0kQZJMYv7v+A89i7FeXi+nfG1O 953VCQFi35mwo8UlkdS/u9yllrxXAcqjosMtTRdmS/OpjbZWnpKWv3V7t1E5Oa6IIrVU 4WDw== X-Gm-Message-State: AGi0PuYNEp4CYzXz7uG1VgJetHgXNOQIxxOSHb2nUbXKwxrXjugfL8ic s3AyTKankC/6srhRF+6CLAOU5HplFQzMqPYnXjaqBwL4awW/s/5ZXAkOoS4oQCs3utZvJea9OOI b3RXOVT13OzsV142EoT8wKvo8yadt X-Received: by 2002:a1c:147:: with SMTP id 68mr24228946wmb.28.1586868257530; Tue, 14 Apr 2020 05:44:17 -0700 (PDT) X-Google-Smtp-Source: APiQypJ6wN8g3wQLLN2KDP/D/IgWf7DatiJ17rYX27xAXjxyuMyzqvoWzXAAA6WPVEIYS0CMkz6Yow== X-Received: by 2002:a1c:147:: with SMTP id 68mr24228852wmb.28.1586868257170; Tue, 14 Apr 2020 05:44:17 -0700 (PDT) Received: from localhost.localdomain ([194.230.155.210]) by smtp.gmail.com with ESMTPSA id m14sm16948816wrs.76.2020.04.14.05.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 05:44:16 -0700 (PDT) From: Emanuele Giuseppe Esposito To: linux-nfs@vger.kernel.org Subject: [PATCH 6/8] simplefs: add file creation functions Date: Tue, 14 Apr 2020 14:43:00 +0200 Message-Id: <20200414124304.4470-7-eesposit@redhat.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200414124304.4470-1-eesposit@redhat.com> References: <20200414124304.4470-1-eesposit@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Song Liu , linux-usb@vger.kernel.org, bpf@vger.kernel.org, "Rafael J. Wysocki" , David Airlie , Heiko Carstens , Alexei Starovoitov , dri-devel@lists.freedesktop.org, "J. Bruce Fields" , Joseph Qi , Hugh Dickins , Paul Mackerras , John Johansen , linux-s390@vger.kernel.org, Christoph Hellwig , Andrew Donnellan , Emanuele Giuseppe Esposito , Matthew Garrett , linux-efi@vger.kernel.org, Arnd Bergmann , Daniel Borkmann , Christian Borntraeger , linux-rdma@vger.kernel.org, Michael Ellerman , Mark Fasheh , Anton Vorontsov , John Fastabend , James Morris , Ard Biesheuvel , Jason Gunthorpe , Doug Ledford , oprofile-list@lists.sf.net, Yonghong Song , Ian Kent , Andrii Nakryiko , Alexey Dobriyan , "Serge E. Hallyn" , netdev@vger.kernel.org, Robert Richter , Thomas Zimmermann , Vasily Gorbik , Tony Luck , Kees Cook , "James E.J. Bottomley" , autofs@vger.kernel.org, Uma Krishnan , linux-fsdevel@vger.kernel.org, "Manoj N. Kumar" , Alexander Viro , Jakub Kicinski , KP Singh , Trond Myklebust , "Matthew R. Ochs" , "David S. Miller" , Felipe Balbi , Mike Marciniszyn , Iurii Zaikin , linux-scsi@vger.kernel.org, "Martin K. Petersen" , linux-mm@kvack.org, Greg Kroah-Hartman , Dennis Dalessandro , Miklos Szeredi , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Anna Schumaker , Luis Chamberlain , Chuck Lever , Jeremy Kerr , Colin Cross , Frederic Barrat , Paolo Bonzini , Andrew Morton , Mike Kravetz , linuxppc-dev@lists.ozlabs.org, Martin KaFai Lau , ocfs2-devel@oss.oracle.com, Joel Becker Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" A bunch of code is duplicated between debugfs and tracefs, unify it to the simplefs library. The code is very similar, except that dentry and inode creation are unified into a single function (unlike start_creating in debugfs and tracefs, which only takes care of dentries). This adds an output parameter to the creation functions, but pushes all error recovery into fs/simplefs.c. Signed-off-by: Emanuele Giuseppe Esposito --- fs/simplefs.c | 150 +++++++++++++++++++++++++++++++++++++++ include/linux/simplefs.h | 19 +++++ 2 files changed, 169 insertions(+) diff --git a/fs/simplefs.c b/fs/simplefs.c index c59eb8d996be..3e48a288beb3 100644 --- a/fs/simplefs.c +++ b/fs/simplefs.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include #include +#include +#include static DEFINE_SPINLOCK(pin_fs_lock); @@ -42,3 +44,151 @@ struct inode *simple_alloc_anon_inode(struct simple_fs *fs) return alloc_anon_inode(fs->mount->mnt_sb); } EXPORT_SYMBOL(simple_alloc_anon_inode); + +static struct dentry *failed_creating(struct simple_fs *fs, struct dentry *dentry) +{ + inode_unlock(d_inode(dentry->d_parent)); + dput(dentry); + simple_release_fs(fs); + return ERR_PTR(-ENOMEM); +} + +struct dentry *simplefs_create_dentry(struct simple_fs *fs, struct file_system_type *type, + const char *name, struct dentry *parent, + struct inode **inode) +{ + struct dentry *dentry; + int error; + + pr_debug("creating file '%s'\n", name); + + if (IS_ERR(parent)) + return parent; + + error = simple_pin_fs(fs, type); + if (error) { + pr_err("Unable to pin filesystem for file '%s'\n", name); + 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 = fs->mount->mnt_root; + + inode_lock(d_inode(parent)); + dentry = lookup_one_len(name, parent, strlen(name)); + if (!IS_ERR(dentry) && d_really_is_positive(dentry)) { + if (d_is_dir(dentry)) + pr_err("Directory '%s' with parent '%s' already present!\n", + name, parent->d_name.name); + else + pr_err("File '%s' in directory '%s' already present!\n", + name, parent->d_name.name); + dput(dentry); + dentry = ERR_PTR(-EEXIST); + } + + if (IS_ERR(dentry)) { + inode_unlock(d_inode(parent)); + simple_release_fs(fs); + } + + + if (IS_ERR(dentry)) + return dentry; + + *inode = simple_new_inode(fs->mount->mnt_sb); + if (unlikely(!(*inode))) { + pr_err("out of free inodes, can not create file '%s'\n", + name); + return failed_creating(fs, dentry); + } + + return dentry; +} +EXPORT_SYMBOL(simplefs_create_dentry); + +struct dentry *simplefs_create_file(struct simple_fs *fs, struct file_system_type *type, + const char *name, umode_t mode, + struct dentry *parent, void *data, + struct inode **inode) +{ + struct dentry *dentry; + + WARN_ON((mode & S_IFMT) && !S_ISREG(mode)); + mode |= S_IFREG; + + dentry = simplefs_create_dentry(fs, type, name, parent, inode); + + if (IS_ERR(dentry)) + return dentry; + + (*inode)->i_mode = mode; + (*inode)->i_private = data; + + return dentry; +} +EXPORT_SYMBOL(simplefs_create_file); + +struct dentry *simplefs_finish_dentry(struct dentry *dentry, struct inode *inode) +{ + d_instantiate(dentry, inode); + if (S_ISDIR(inode->i_mode)) { + inc_nlink(d_inode(dentry->d_parent)); + fsnotify_mkdir(d_inode(dentry->d_parent), dentry); + } else { + fsnotify_create(d_inode(dentry->d_parent), dentry); + } + inode_unlock(d_inode(dentry->d_parent)); + return dentry; +} +EXPORT_SYMBOL(simplefs_finish_dentry); + +struct dentry *simplefs_create_dir(struct simple_fs *fs, struct file_system_type *type, + const char *name, umode_t mode, struct dentry *parent, + struct inode **inode) +{ + struct dentry *dentry; + + WARN_ON((mode & S_IFMT) && !S_ISDIR(mode)); + mode |= S_IFDIR; + + dentry = simplefs_create_dentry(fs, type, name, parent, inode); + if (IS_ERR(dentry)) + return dentry; + + (*inode)->i_mode = mode; + (*inode)->i_op = &simple_dir_inode_operations; + (*inode)->i_fop = &simple_dir_operations; + + /* directory inodes start off with i_nlink == 2 (for "." entry) */ + inc_nlink(*inode); + return dentry; +} +EXPORT_SYMBOL(simplefs_create_dir); + +struct dentry *simplefs_create_symlink(struct simple_fs *fs, struct file_system_type *type, + const char *name, struct dentry *parent, + const char *target, struct inode **inode) +{ + struct dentry *dentry; + char *link = kstrdup(target, GFP_KERNEL); + if (!link) + return ERR_PTR(-ENOMEM); + + dentry = simplefs_create_dentry(fs, type, name, parent, inode); + if (IS_ERR(dentry)) { + kfree_link(link); + return dentry; + } + + (*inode)->i_mode = S_IFLNK | S_IRWXUGO; + (*inode)->i_link = link; + (*inode)->i_op = &simple_symlink_inode_operations; + return dentry; +} +EXPORT_SYMBOL(simplefs_create_symlink); diff --git a/include/linux/simplefs.h b/include/linux/simplefs.h index c62ab526414e..cc53eed0bc3d 100644 --- a/include/linux/simplefs.h +++ b/include/linux/simplefs.h @@ -14,4 +14,23 @@ extern void simple_release_fs(struct simple_fs *); extern struct inode *simple_alloc_anon_inode(struct simple_fs *fs); +extern struct dentry *simplefs_create_dentry(struct simple_fs *fs, + struct file_system_type *type, + const char *name, struct dentry *parent, + struct inode **inode); +struct dentry *simplefs_finish_dentry(struct dentry *dentry, struct inode *inode); + +extern struct dentry *simplefs_create_file(struct simple_fs *fs, + struct file_system_type *type, + const char *name, umode_t mode, + struct dentry *parent, void *data, + struct inode **inode); +extern struct dentry *simplefs_create_dir(struct simple_fs *fs, struct file_system_type *type, + const char *name, umode_t mode, struct dentry *parent, + struct inode **inode); +extern struct dentry *simplefs_create_symlink(struct simple_fs *fs, struct file_system_type *type, + const char *name, struct dentry *parent, + const char *target, struct inode **inode); + + #endif -- 2.25.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB881C2BA19 for ; Tue, 14 Apr 2020 12:44:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 514E4206A2 for ; Tue, 14 Apr 2020 12:44:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PPRVY0//" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 514E4206A2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 005598E000B; Tue, 14 Apr 2020 08:44:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ED0968E0001; Tue, 14 Apr 2020 08:44:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D71C08E000B; Tue, 14 Apr 2020 08:44:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0050.hostedemail.com [216.40.44.50]) by kanga.kvack.org (Postfix) with ESMTP id BD3988E0001 for ; Tue, 14 Apr 2020 08:44:21 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 820088245571 for ; Tue, 14 Apr 2020 12:44:21 +0000 (UTC) X-FDA: 76706428722.08.flag19_25fc45ee1b705 X-HE-Tag: flag19_25fc45ee1b705 X-Filterd-Recvd-Size: 13473 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Tue, 14 Apr 2020 12:44:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586868260; 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=SkKDvUy87926CmAT32HsWjLbIxTbOhqOTHC/vd3O4C0=; b=PPRVY0//R7+wGy76PFqhvcL4eN1VmoAGOXLH5cDTGEDWxHXQ+hPjU+LAhKLskfW+LtHLD3 WUUj2HQvr5t8j+l3kuY3OGatGa82lBUKCMDW2ccywZJoZDEk1xvJ18IHt89wSOUBK+U1f0 qWLA11+kzEtLwogQQ0PmThWG9N8NsLs= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-455-pdFRjNOEOba0HcJRkmd0lQ-1; Tue, 14 Apr 2020 08:44:18 -0400 X-MC-Unique: pdFRjNOEOba0HcJRkmd0lQ-1 Received: by mail-wm1-f72.google.com with SMTP id c129so3706104wme.8 for ; Tue, 14 Apr 2020 05:44:18 -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=sI5vxC1ZvKgnSHwtEppycudchqTAWMoyZNsGMD6XBfs=; b=ePxC+Z4tNmNLY+YJeUZhO3zjhwd+5QgKLT7JFBvpBlaAWn2qKFZTjHi31a+W15+9Af 8VDz/oOWCn5Z38VzKJcyihVg6O6Zr/maPIaGl/4Nxaa3uD7JGy8VR22GS9bKIYuIGkNv tUHjQBqwTbt8qlfLqGdlvgFDoAol+JgtQcqexMU3hd3ZGYUpVSCKH+mv3rzhO8+NjJdP Ao7SrLgiyyVfNjYTarAILEEnlhZ7/HhLMDNJSknz1UJnyxPhg9sguALsnFqZkrkd0w/b hi6RLpZG6IPOh2SNPkeqwtEDmYpxl43W+kRCMmXy6+VLwILpjjMIdoG9Bklgwlf3p8Yh iAfg== X-Gm-Message-State: AGi0PubKDy6FERbDxhlvfauYcGVAu6SO8oAuE6cbK9h4FCsYzBt32vi8 RauqwaithJowdq6awOphAu8R4hDH8Add1VHw2fi8SFrnpkQP5ldNTUjXz6i44bsrvNaI6Ffo57Z S3Bq3hAlnXmI= X-Received: by 2002:a1c:147:: with SMTP id 68mr24228950wmb.28.1586868257534; Tue, 14 Apr 2020 05:44:17 -0700 (PDT) X-Google-Smtp-Source: APiQypJ6wN8g3wQLLN2KDP/D/IgWf7DatiJ17rYX27xAXjxyuMyzqvoWzXAAA6WPVEIYS0CMkz6Yow== X-Received: by 2002:a1c:147:: with SMTP id 68mr24228852wmb.28.1586868257170; Tue, 14 Apr 2020 05:44:17 -0700 (PDT) Received: from localhost.localdomain ([194.230.155.210]) by smtp.gmail.com with ESMTPSA id m14sm16948816wrs.76.2020.04.14.05.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 05:44:16 -0700 (PDT) From: Emanuele Giuseppe Esposito To: linux-nfs@vger.kernel.org Cc: Paolo Bonzini , Emanuele Giuseppe Esposito , Jeremy Kerr , Arnd Bergmann , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Dennis Dalessandro , Mike Marciniszyn , Doug Ledford , Jason Gunthorpe , Frederic Barrat , Andrew Donnellan , Greg Kroah-Hartman , Robert Richter , "Manoj N. Kumar" , "Matthew R. Ochs" , Uma Krishnan , "James E.J. Bottomley" , "Martin K. Petersen" , Felipe Balbi , Alexander Viro , Ian Kent , Joel Becker , Christoph Hellwig , "Rafael J. Wysocki" , Matthew Garrett , Ard Biesheuvel , Miklos Szeredi , Mike Kravetz , Mark Fasheh , Joseph Qi , Alexey Dobriyan , Luis Chamberlain , Kees Cook , Iurii Zaikin , Anton Vorontsov , Colin Cross , Tony Luck , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , John Fastabend , KP Singh , Hugh Dickins , Andrew Morton , "J. Bruce Fields" , Chuck Lever , Trond Myklebust , Anna Schumaker , "David S. Miller" , Jakub Kicinski , James Morris , "Serge E. Hallyn" , John Johansen , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rdma@vger.kernel.org, oprofile-list@lists.sf.net, linux-scsi@vger.kernel.org, linux-usb@vger.kernel.org, linux-fsdevel@vger.kernel.org, autofs@vger.kernel.org, linux-efi@vger.kernel.org, linux-mm@kvack.org, ocfs2-devel@oss.oracle.com, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH 6/8] simplefs: add file creation functions Date: Tue, 14 Apr 2020 14:43:00 +0200 Message-Id: <20200414124304.4470-7-eesposit@redhat.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200414124304.4470-1-eesposit@redhat.com> References: <20200414124304.4470-1-eesposit@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: A bunch of code is duplicated between debugfs and tracefs, unify it to the simplefs library. The code is very similar, except that dentry and inode creation are unified into a single function (unlike start_creating in debugfs and tracefs, which only takes care of dentries). This adds an output parameter to the creatio= n functions, but pushes all error recovery into fs/simplefs.c. Signed-off-by: Emanuele Giuseppe Esposito --- fs/simplefs.c | 150 +++++++++++++++++++++++++++++++++++++++ include/linux/simplefs.h | 19 +++++ 2 files changed, 169 insertions(+) diff --git a/fs/simplefs.c b/fs/simplefs.c index c59eb8d996be..3e48a288beb3 100644 --- a/fs/simplefs.c +++ b/fs/simplefs.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include #include +#include +#include =20 static DEFINE_SPINLOCK(pin_fs_lock); =20 @@ -42,3 +44,151 @@ struct inode *simple_alloc_anon_inode(struct simple_fs = *fs) =09return alloc_anon_inode(fs->mount->mnt_sb); } EXPORT_SYMBOL(simple_alloc_anon_inode); + +static struct dentry *failed_creating(struct simple_fs *fs, struct dentry = *dentry) +{ +=09inode_unlock(d_inode(dentry->d_parent)); +=09dput(dentry); +=09simple_release_fs(fs); +=09return ERR_PTR(-ENOMEM); +} + +struct dentry *simplefs_create_dentry(struct simple_fs *fs, struct file_sy= stem_type *type, +=09=09=09=09 const char *name, struct dentry *parent, +=09=09=09=09 struct inode **inode) +{ +=09struct dentry *dentry; +=09int error; + +=09pr_debug("creating file '%s'\n", name); + +=09if (IS_ERR(parent)) +=09=09return parent; + +=09error =3D simple_pin_fs(fs, type); +=09if (error) { +=09=09pr_err("Unable to pin filesystem for file '%s'\n", name); +=09=09return ERR_PTR(error); +=09} + +=09/* If the parent is not specified, we create it in the root. +=09 * We need the root dentry to do this, which is in the super +=09 * block. A pointer to that is in the struct vfsmount that we +=09 * have around. +=09 */ +=09if (!parent) +=09=09parent =3D fs->mount->mnt_root; + +=09inode_lock(d_inode(parent)); +=09dentry =3D lookup_one_len(name, parent, strlen(name)); +=09if (!IS_ERR(dentry) && d_really_is_positive(dentry)) { +=09=09if (d_is_dir(dentry)) +=09=09=09pr_err("Directory '%s' with parent '%s' already present!\n", +=09=09=09 name, parent->d_name.name); +=09=09else +=09=09=09pr_err("File '%s' in directory '%s' already present!\n", +=09=09=09 name, parent->d_name.name); +=09=09dput(dentry); +=09=09dentry =3D ERR_PTR(-EEXIST); +=09} + +=09if (IS_ERR(dentry)) { +=09=09inode_unlock(d_inode(parent)); +=09=09simple_release_fs(fs); +=09} + + +=09if (IS_ERR(dentry)) +=09=09return dentry; + +=09*inode =3D simple_new_inode(fs->mount->mnt_sb); +=09if (unlikely(!(*inode))) { +=09=09pr_err("out of free inodes, can not create file '%s'\n", +=09=09 name); +=09=09return failed_creating(fs, dentry); +=09} + +=09return dentry; +} +EXPORT_SYMBOL(simplefs_create_dentry); + +struct dentry *simplefs_create_file(struct simple_fs *fs, struct file_syst= em_type *type, +=09=09=09=09 const char *name, umode_t mode, +=09=09=09=09 struct dentry *parent, void *data, +=09=09=09=09 struct inode **inode) +{ +=09struct dentry *dentry; + +=09WARN_ON((mode & S_IFMT) && !S_ISREG(mode)); +=09mode |=3D S_IFREG; + +=09dentry =3D simplefs_create_dentry(fs, type, name, parent, inode); + +=09if (IS_ERR(dentry)) +=09=09return dentry; + +=09(*inode)->i_mode =3D mode; +=09(*inode)->i_private =3D data; + +=09return dentry; +} +EXPORT_SYMBOL(simplefs_create_file); + +struct dentry *simplefs_finish_dentry(struct dentry *dentry, struct inode = *inode) +{ +=09d_instantiate(dentry, inode); +=09if (S_ISDIR(inode->i_mode)) { +=09=09inc_nlink(d_inode(dentry->d_parent)); +=09=09fsnotify_mkdir(d_inode(dentry->d_parent), dentry); +=09} else { +=09=09fsnotify_create(d_inode(dentry->d_parent), dentry); +=09} +=09inode_unlock(d_inode(dentry->d_parent)); +=09return dentry; +} +EXPORT_SYMBOL(simplefs_finish_dentry); + +struct dentry *simplefs_create_dir(struct simple_fs *fs, struct file_syste= m_type *type, +=09=09=09=09 const char *name, umode_t mode, struct dentry *parent, +=09=09=09=09 struct inode **inode) +{ +=09struct dentry *dentry; + +=09WARN_ON((mode & S_IFMT) && !S_ISDIR(mode)); +=09mode |=3D S_IFDIR; + +=09dentry =3D simplefs_create_dentry(fs, type, name, parent, inode); +=09if (IS_ERR(dentry)) +=09=09return dentry; + +=09(*inode)->i_mode =3D mode; +=09(*inode)->i_op =3D &simple_dir_inode_operations; +=09(*inode)->i_fop =3D &simple_dir_operations; + +=09/* directory inodes start off with i_nlink =3D=3D 2 (for "." entry) */ +=09inc_nlink(*inode); +=09return dentry; +} +EXPORT_SYMBOL(simplefs_create_dir); + +struct dentry *simplefs_create_symlink(struct simple_fs *fs, struct file_s= ystem_type *type, +=09=09=09=09 const char *name, struct dentry *parent, +=09=09=09=09 const char *target, struct inode **inode) +{ +=09struct dentry *dentry; +=09char *link =3D kstrdup(target, GFP_KERNEL); +=09if (!link) +=09=09return ERR_PTR(-ENOMEM); + +=09dentry =3D simplefs_create_dentry(fs, type, name, parent, inode); +=09if (IS_ERR(dentry)) { +=09=09kfree_link(link); +=09=09return dentry; +=09} + +=09(*inode)->i_mode =3D S_IFLNK | S_IRWXUGO; +=09(*inode)->i_link =3D link; +=09(*inode)->i_op =3D &simple_symlink_inode_operations; +=09return dentry; +} +EXPORT_SYMBOL(simplefs_create_symlink); diff --git a/include/linux/simplefs.h b/include/linux/simplefs.h index c62ab526414e..cc53eed0bc3d 100644 --- a/include/linux/simplefs.h +++ b/include/linux/simplefs.h @@ -14,4 +14,23 @@ extern void simple_release_fs(struct simple_fs *); =20 extern struct inode *simple_alloc_anon_inode(struct simple_fs *fs); =20 +extern struct dentry *simplefs_create_dentry(struct simple_fs *fs, +=09=09=09=09=09 struct file_system_type *type, +=09=09=09=09=09 const char *name, struct dentry *parent, +=09=09=09=09=09 struct inode **inode); +struct dentry *simplefs_finish_dentry(struct dentry *dentry, struct inode = *inode); + +extern struct dentry *simplefs_create_file(struct simple_fs *fs, +=09=09=09=09=09 struct file_system_type *type, +=09=09=09=09=09 const char *name, umode_t mode, +=09=09=09=09=09 struct dentry *parent, void *data, +=09=09=09=09=09 struct inode **inode); +extern struct dentry *simplefs_create_dir(struct simple_fs *fs, struct fil= e_system_type *type, +=09=09=09=09=09 const char *name, umode_t mode, struct dentry *parent, +=09=09=09=09=09 struct inode **inode); +extern struct dentry *simplefs_create_symlink(struct simple_fs *fs, struct= file_system_type *type, +=09=09=09=09=09 const char *name, struct dentry *parent, +=09=09=09=09=09 const char *target, struct inode **inode); + + #endif --=20 2.25.2