From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754662AbbIBMg4 (ORCPT ); Wed, 2 Sep 2015 08:36:56 -0400 Received: from mail-la0-f47.google.com ([209.85.215.47]:36057 "EHLO mail-la0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754625AbbIBMgx (ORCPT ); Wed, 2 Sep 2015 08:36:53 -0400 From: ulfalizer.lkml@gmail.com To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, corbet@lwn.net, harryxiyou@gmail.com, jlbec@evilplan.org, ulfalizer@gmail.com, gregkh@linuxfoundation.org, shane.seymour@hp.com, tj@kernel.org, bvanassche@acm.org, serue@us.ibm.com Subject: [PATCH 3/3] configfs: fix pre-kernfs sysfs_dirent reference Date: Wed, 2 Sep 2015 14:34:54 +0200 Message-Id: <1441197294-11723-4-git-send-email-ulfalizer.lkml@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441197294-11723-3-git-send-email-ulfalizer.lkml@gmail.com> References: <1441197294-11723-1-git-send-email-ulfalizer.lkml@gmail.com> <1441197294-11723-2-git-send-email-ulfalizer.lkml@gmail.com> <1441197294-11723-3-git-send-email-ulfalizer.lkml@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ulf Magnusson sysfs_dirent was renamed in 324a56e16e44 ("kernfs: s/sysfs_dirent/kernfs_node/ and rename its friends accordingly"). Do s/sysfs_dirent/configfs_dirent/ - possibly a copy-paste error to begin with. Clean up the language a bit too. Signed-off-by: Ulf Magnusson --- fs/configfs/inode.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c index eae8757..e076661 100644 --- a/fs/configfs/inode.c +++ b/fs/configfs/inode.c @@ -133,13 +133,14 @@ struct inode *configfs_new_inode(umode_t mode, struct configfs_dirent *sd, inode->i_mapping->a_ops = &configfs_aops; inode->i_op = &configfs_inode_operations; - if (sd->s_iattr) { - /* sysfs_dirent has non-default attributes - * get them for the new inode from persistent copy - * in sysfs_dirent + if (sd->s_iattr) + /* + * configfs_dirent has non-default attributes. Set them + * on the new inode from the persistent copy in + * configfs_dirent. */ set_inode_attr(inode, sd->s_iattr); - } else + else set_default_inode_attr(inode, mode); } return inode; -- 2.1.4