public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: maneesh@in.ibm.com
Subject: [PATCH] sysfs-iattr: set inode attributes
Date: Mon, 20 Jun 2005 15:59:29 -0700	[thread overview]
Message-ID: <1119308369371@kroah.com> (raw)
In-Reply-To: <1119308369529@kroah.com>

[PATCH] sysfs-iattr: set inode attributes

o Following patch sets the attributes for newly allocated inodes for sysfs
  objects. If the object has non-default attributes, inode attributes are
  set as saved in sysfs_dirent->s_iattr, pointer to struct iattr.

Signed-off-by: Maneesh Soni <maneesh@in.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
commit 8215534ce7d073423bfa9c17405c43ab7636ca03
tree b53aed1111cf10a7d42ef0695308c4a70b820747
parent 988d186de5b6966a71a8cc52e6cb4895fd2f7799
author Maneesh Soni <maneesh@in.ibm.com> Tue, 31 May 2005 10:39:52 +0530
committer Greg Kroah-Hartman <gregkh@suse.de> Mon, 20 Jun 2005 15:15:37 -0700

 fs/sysfs/inode.c |   37 +++++++++++++++++++++++++++++++------
 fs/sysfs/mount.c |    4 +++-
 fs/sysfs/sysfs.h |    2 +-
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -91,18 +91,42 @@ int sysfs_setattr(struct dentry * dentry
 	return error;
 }
 
-struct inode * sysfs_new_inode(mode_t mode)
+static inline void set_default_inode_attr(struct inode * inode, mode_t mode)
+{
+	inode->i_mode = mode;
+	inode->i_uid = 0;
+	inode->i_gid = 0;
+	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+}
+
+static inline void set_inode_attr(struct inode * inode, struct iattr * iattr)
+{
+	inode->i_mode = iattr->ia_mode;
+	inode->i_uid = iattr->ia_uid;
+	inode->i_gid = iattr->ia_gid;
+	inode->i_atime = iattr->ia_atime;
+	inode->i_mtime = iattr->ia_mtime;
+	inode->i_ctime = iattr->ia_ctime;
+}
+
+struct inode * sysfs_new_inode(mode_t mode, struct sysfs_dirent * sd)
 {
 	struct inode * inode = new_inode(sysfs_sb);
 	if (inode) {
-		inode->i_mode = mode;
-		inode->i_uid = 0;
-		inode->i_gid = 0;
 		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
-		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 		inode->i_mapping->a_ops = &sysfs_aops;
 		inode->i_mapping->backing_dev_info = &sysfs_backing_dev_info;
+		inode->i_op = &sysfs_inode_operations;
+
+		if (sd->s_iattr) {
+			/* sysfs_dirent has non-default attributes
+			 * get them for the new inode from persistent copy
+			 * in sysfs_dirent
+			 */
+			set_inode_attr(inode, sd->s_iattr);
+		} else
+			set_default_inode_attr(inode, mode);
 	}
 	return inode;
 }
@@ -113,7 +137,8 @@ int sysfs_create(struct dentry * dentry,
 	struct inode * inode = NULL;
 	if (dentry) {
 		if (!dentry->d_inode) {
-			if ((inode = sysfs_new_inode(mode))) {
+			struct sysfs_dirent * sd = dentry->d_fsdata;
+			if ((inode = sysfs_new_inode(mode, sd))) {
 				if (dentry->d_parent && dentry->d_parent->d_inode) {
 					struct inode *p_inode = dentry->d_parent->d_inode;
 					p_inode->i_mtime = p_inode->i_ctime = CURRENT_TIME;
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -28,6 +28,7 @@ static struct sysfs_dirent sysfs_root = 
 	.s_children	= LIST_HEAD_INIT(sysfs_root.s_children),
 	.s_element	= NULL,
 	.s_type		= SYSFS_ROOT,
+	.s_iattr	= NULL,
 };
 
 static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
@@ -42,7 +43,8 @@ static int sysfs_fill_super(struct super
 	sb->s_time_gran = 1;
 	sysfs_sb = sb;
 
-	inode = sysfs_new_inode(S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO);
+	inode = sysfs_new_inode(S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
+				 &sysfs_root);
 	if (inode) {
 		inode->i_op = &sysfs_dir_inode_operations;
 		inode->i_fop = &sysfs_dir_operations;
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -2,7 +2,7 @@
 extern struct vfsmount * sysfs_mount;
 extern kmem_cache_t *sysfs_dir_cachep;
 
-extern struct inode * sysfs_new_inode(mode_t mode);
+extern struct inode * sysfs_new_inode(mode_t mode, struct sysfs_dirent *);
 extern int sysfs_create(struct dentry *, int mode, int (*init)(struct inode *));
 
 extern int sysfs_make_dirent(struct sysfs_dirent *, struct dentry *, void *,


  reply	other threads:[~2005-06-20 23:30 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-06-20 22:55 [GIT PATCH] Driver core changes for 2.6.12 Greg KH
2005-06-20 22:59 ` [PATCH] sysfs_{create|remove}_link should take const char * Greg KH
2005-06-20 22:59   ` [PATCH] kobject_hotplug() should use kobject_name() Greg KH
2005-06-20 22:59     ` [PATCH] Make kobject's name be const char * Greg KH
2005-06-20 22:59       ` [PATCH] kset_hotplug_ops->name shoudl return " Greg KH
2005-06-20 22:59         ` [PATCH] make driver's name be " Greg KH
2005-06-20 22:59           ` [PATCH] Make attributes names " Greg KH
2005-06-20 22:59             ` [PATCH] sysfs: (driver/base) if show/store is missing return -EIO Greg KH
2005-06-20 22:59               ` [PATCH] sysfs: " Greg KH
2005-06-20 22:59                 ` [PATCH] sysfs: (driver/pci) " Greg KH
2005-06-20 22:59                   ` [PATCH] sysfs: (driver/block) " Greg KH
2005-06-20 22:59                     ` [PATCH] sysfs: (rest) " Greg KH
2005-06-20 22:59                       ` [PATCH] INPUT: move to use the new class code, instead of class_simple Greg KH
2005-06-20 22:59                         ` [PATCH] tty: " Greg KH
2005-06-20 22:59                           ` [PATCH] CLASS: move a "simple" class logic into the class core Greg KH
2005-06-20 22:59                             ` [PATCH] class: convert sound/* to use the new class api instead of class_simple Greg KH
2005-06-20 22:59                               ` [PATCH] USB: move the usb hcd code to use the new class code Greg KH
2005-06-20 22:59                                 ` [PATCH] class: convert drivers/block/* to use the new class api instead of class_simple Greg KH
2005-06-20 22:59                                   ` [PATCH] class: convert drivers/ieee1394/* " Greg KH
2005-06-20 22:59                                     ` [PATCH] class: convert drivers/char/* " Greg KH
2005-06-20 22:59                                       ` [PATCH] class: convert drivers/scsi/* " Greg KH
2005-06-20 22:59                                         ` [PATCH] class: convert drivers/* " Greg KH
2005-06-20 22:59                                           ` [PATCH] USB: trivial error path fix Greg KH
2005-06-20 22:59                                             ` [PATCH] class: convert arch/* to use the new class api instead of class_simple Greg KH
2005-06-20 22:59                                               ` [PATCH] class: convert the remaining class_simple users in the kernel to usee the new class api Greg KH
2005-06-20 22:59                                                 ` [PATCH] class: add kerneldoc for the new class functions Greg KH
2005-06-20 22:59                                                   ` [PATCH] class: remove class_simple code, as no one in the tree is using it anymore Greg KH
2005-06-20 22:59                                                     ` [PATCH] fix "make mandocs" after class_simple.c removal Greg KH
2005-06-20 22:59                                                       ` [PATCH] Add a semaphore to struct device to synchronize calls to its driver Greg KH
2005-06-20 22:59                                                         ` [PATCH] fix up ipmi code after class_simple.c removal Greg KH
2005-06-20 22:59                                                           ` [PATCH] Move device/driver code to drivers/base/dd.c Greg KH
2005-06-20 22:59                                                             ` [PATCH] Use driver_for_each_device() instead of manually walking list Greg KH
2005-06-20 22:59                                                               ` [PATCH] Use driver_for_each_device() in drivers/pnp/driver.c " Greg KH
2005-06-20 22:59                                                                 ` [PATCH] Add driver_for_each_device() Greg KH
2005-06-20 22:59                                                                   ` [PATCH] Add a klist to struct bus_type for its drivers Greg KH
2005-06-20 22:59                                                                     ` [PATCH] Add a klist to struct bus_type for its devices Greg KH
2005-06-20 22:59                                                                       ` [PATCH] Add initial implementation of klist helpers Greg KH
2005-06-20 22:59                                                                         ` [PATCH] Add a klist to struct device_driver for the devices bound to it Greg KH
2005-06-20 22:59                                                                           ` [PATCH] Remove the unused device_find() Greg KH
2005-06-20 22:59                                                                             ` [PATCH] Use bus_for_each_{dev,drv} for driver binding Greg KH
2005-06-20 22:59                                                                               ` [PATCH] add klist_node_attached() to determine if a node is on a list or not Greg KH
2005-06-20 22:59                                                                                 ` [PATCH] Fix up USB to use klist_node_attached() instead of list_empty() on lists that will go away Greg KH
2005-06-20 22:59                                                                                   ` [PATCH] Remove struct device::driver_list Greg KH
2005-06-20 22:59                                                                                     ` [PATCH] Fix up bus code and remove use of rwsem Greg KH
2005-06-20 22:59                                                                                       ` [PATCH] Remove struct device::bus_list Greg KH
2005-06-20 22:59                                                                                         ` [PATCH] Don't reference NULL klist pointer in klist_remove() Greg KH
2005-06-20 22:59                                                                                           ` [PATCH] Call klist_del() instead of klist_remove() Greg KH
2005-06-20 22:59                                                                                             ` [PATCH] Use device_for_each_child() to unregister devices in scsi_remove_target() Greg KH
2005-06-20 22:59                                                                                               ` [PATCH] use device_for_each_child() to properly access child devices Greg KH
2005-06-20 22:59                                                                                                 ` [PATCH] Use a klist for device child lists Greg KH
2005-06-20 22:59                                                                                                   ` [PATCH] Fix up bogus comment Greg KH
2005-06-20 22:59                                                                                                     ` [PATCH] driver core: change export symbol for driver_for_each_device() Greg KH
2005-06-20 22:59                                                                                                       ` [PATCH] Use device_for_each_child() to unregister devices in nodemgr_remove_host_dev() Greg KH
2005-06-20 22:59                                                                                                         ` [PATCH] use device_for_each_child() to properly access child devices Greg KH
2005-06-20 22:59                                                                                                           ` [PATCH] USB: fix build warning in usb core as pointed out by Andrew Greg KH
2005-06-20 22:59                                                                                                             ` [PATCH] Driver Core: fix bk-driver-core kills ppc64 Greg KH
2005-06-20 22:59                                                                                                               ` [PATCH] Fix typo in scdrv_init() Greg KH
2005-06-20 22:59                                                                                                                 ` [PATCH] Driver core: Fix up the driver and device iterators to be quieter Greg KH
2005-06-20 22:59                                                                                                                   ` [PATCH] usb: klist_node_attached() fix Greg KH
2005-06-20 22:59                                                                                                                     ` [PATCH] sn: fixes due to driver core changes Greg KH
2005-06-20 22:59                                                                                                                       ` [PATCH] driver core: Fix races in driver_detach() Greg KH
2005-06-20 22:59                                                                                                                         ` [PATCH] Driver Core: driver model doc update Greg KH
2005-06-20 22:59                                                                                                                           ` [PATCH] Driver core: unregister_node() for hotplug use Greg KH
2005-06-20 22:59                                                                                                                             ` [PATCH] usbcore: Don't call device_release_driver recursively Greg KH
2005-06-20 22:59                                                                                                                               ` [PATCH] libfs: add simple attribute files Greg KH
2005-06-20 22:59                                                                                                                                 ` [PATCH] Driver core: change device_attribute callbacks Greg KH
2005-06-20 22:59                                                                                                                                   ` [PATCH] driver core: fix error handling in bus_add_device Greg KH
2005-06-20 22:59                                                                                                                                     ` [PATCH] Driver core: Documentation: update device attribute callbacks Greg KH
2005-06-20 22:59                                                                                                                                       ` [PATCH] Driver Core: drivers/base - drivers/i2c/chips/adm1026.c: " Greg KH
2005-06-20 22:59                                                                                                                                         ` [PATCH] Driver Core: arch: " Greg KH
2005-06-20 22:59                                                                                                                                           ` [PATCH] Driver Core: drivers/i2c/chips/adm1031.c - lm75.c: " Greg KH
2005-06-20 22:59                                                                                                                                             ` [PATCH] Driver Core: drivers/i2c/chips/lm77.c - max1619.c: " Greg KH
2005-06-20 22:59                                                                                                                                               ` [PATCH] Driver Core: drivers/i2c/chips/pc87360.c - w83627hf.c: " Greg KH
2005-06-20 22:59                                                                                                                                                 ` [PATCH] Driver Core: drivers/char/raw3270.c - drivers/net/netiucv.c: " Greg KH
2005-06-20 22:59                                                                                                                                                   ` [PATCH] Driver Core: drivers/i2c/chips/w83781d.c - drivers/s390/block/dcssblk.c: " Greg KH
2005-06-20 22:59                                                                                                                                                     ` [PATCH] Driver Core: drivers/usb/input/aiptek.c - drivers/zorro/zorro-sysfs.c: " Greg KH
2005-06-20 22:59                                                                                                                                                       ` [PATCH] Driver Core: drivers/s390/net/qeth_sys.c - drivers/usb/gadget/pxa2xx_udc.c: " Greg KH
2005-06-20 22:59                                                                                                                                                         ` [PATCH] Driver Core: include: " Greg KH
2005-06-20 22:59                                                                                                                                                           ` [PATCH] I2C: drivers/i2c/chips/adm1026.c: use dynamic sysfs callbacks Greg KH
2005-06-20 22:59                                                                                                                                                             ` [PATCH] I2C: add i2c sensor_device_attribute and macros Greg KH
2005-06-20 22:59                                                                                                                                                               ` [PATCH] sysfs-iattr: attach sysfs_dirent before new inode Greg KH
2005-06-20 22:59                                                                                                                                                                 ` [PATCH] Driver core: Don't "lose" devices on suspend on failure Greg KH
2005-06-20 22:59                                                                                                                                                                   ` Greg KH [this message]
2005-06-20 22:59                                                                                                                                                                     ` [PATCH] sysfs-iattr: add sysfs_setattr Greg KH
2005-06-20 22:59                                                                                                                                                                       ` [PATCH] SYSFS: fix PAGE_SIZE check Greg KH
2005-06-20 22:59                                                                                                                                                                         ` [PATCH] USB: fix show_modalias() function due to attribute change Greg KH
2005-06-20 22:59                                                                                                                                                                           ` [PATCH] PCI: " Greg KH
2005-07-06  0:38                                                                                               ` [PATCH] Use device_for_each_child() to unregister devices in scsi_remove_target() Patrick Mansfield
2005-07-12  0:20                                                                                                 ` Greg KH
2005-07-12  0:56                                                                                                   ` Patrick Mansfield
2005-06-21 11:42                                                                         ` [PATCH] Add initial implementation of klist helpers Rik van Riel
2005-06-21 23:13                                                                           ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1119308369371@kroah.com \
    --to=gregkh@suse.de \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maneesh@in.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox