From: "Adam J. Richter" <adam@yggdrasil.com>
To: maneesh@in.ibm.com
Cc: akpm@osdl.org, chrisw@osdl.org, greg@kroah.com,
linux-kernel@vger.kernel.org,
viro@parcelfarce.linux.theplanet.co.uk
Subject: [fake patch] un-inline sysfs_get_kobject and release_sysfs_dirent
Date: Wed, 8 Dec 2004 21:26:32 -0800 [thread overview]
Message-ID: <200412090526.iB95QWs27140@adam.yggdrasil.com> (raw)
Hi Maneesh,
The following fake patch against a heavily hacked
linux-2.6.10-rc2-bk16, which moves sysfs_get_kobject and release_sysfs_dirent
from fs/sysfs/sysfs.h as inline functions to .c files as non-inline
functions. These routines are big enough, that they should not be
inline functions. Although my previous patches have contributed
to this, I believe that the routines were still big enough that making
them non-inline would be justified even without any of my previous
patches.
There were no changes to the contents of the functions other
than making them non-inline, although a previous patch that I posted
added SYSFS_ATTR_GROUP, which resulted in a change to sysfs_get_kobject
which affects this patch, as does my change to avoid allocating
the "s_children" field for non-directories.
I am posting this patch now to simplify my patch for
unpinning sysfs directories, which I expect to post in about
an hour. I am posting it against 2.6.10-rc2-bk16 for consistency
with my stream of patches from a few days ago, which this patch
is based on. After posting the patch for unpinning sysfs directories,
I expect to update to the latest snapshot, and I will then
be able to regenerate patches against that if that would be
helpful.
__ ______________
Adam J. Richter \ /
adam@yggdrasil.com | g g d r a s i l
Signed-off-by: Adam J. Richter <adam@yggdrasil.com>
diff -u linux/fs/sysfs.old/dir.c linux/fs/sysfs/dir.c
--- linux/fs/sysfs.old/dir.c 2004-12-03 12:04:45.000000000 +0800
+++ linux/fs/sysfs/dir.c 2004-12-09 13:14:03.000000000 +0800
@@ -57,6 +57,20 @@
return sd;
}
+void release_sysfs_dirent(struct sysfs_dirent * sd)
+{
+ if (sd->s_type & SYSFS_KOBJ_LINK) {
+ struct sysfs_symlink * sl = sd->s_element;
+ kfree(sl->link_name);
+ kobject_put(sl->target_kobj);
+ kfree(sl);
+ }
+ if (sysfs_type_dir(sd->s_type))
+ kmem_cache_free(sysfs_dir_cachep, to_sysfs_dir(sd));
+ else
+ kmem_cache_free(sysfs_dirent_cachep, sd);
+}
+
int sysfs_make_dirent(struct sysfs_dir * parent_sd, struct dentry * dentry,
void * element, umode_t mode, int type)
{
diff -u linux/fs/sysfs.old/inode.c linux/fs/sysfs/inode.c
--- linux/fs/sysfs.old/inode.c 2004-12-03 12:04:45.000000000 +0800
+++ linux/fs/sysfs/inode.c 2004-12-09 13:14:21.000000000 +0800
@@ -164,4 +164,24 @@
up(&dir->d_inode->i_sem);
}
+struct kobject *sysfs_get_kobject(struct dentry *dentry)
+{
+ struct kobject * kobj = NULL;
+ spin_lock(&dcache_lock);
+ if (!d_unhashed(dentry)) {
+ struct sysfs_dirent * sd = dentry->d_fsdata;
+ if (sd->s_type == SYSFS_ATTR_GROUP) {
+ sd = dentry->d_parent->d_fsdata;
+ BUG_ON(sd->s_type != SYSFS_DIR);
+ }
+ if (sd->s_type & SYSFS_KOBJ_LINK) {
+ struct sysfs_symlink * sl = sd->s_element;
+ kobj = kobject_get(sl->target_kobj);
+ } else
+ kobj = kobject_get(sd->s_element);
+ }
+ spin_unlock(&dcache_lock);
+
+ return kobj;
+}
diff -u linux/fs/sysfs.old/sysfs.h linux/fs/sysfs/sysfs.h
--- linux/fs/sysfs.old/sysfs.h 2004-12-03 12:04:45.000000000 +0800
+++ linux/fs/sysfs/sysfs.h 2004-12-09 13:09:40.000000000 +0800
@@ -98,41 +98,8 @@
return ((struct bin_attribute *) sd->s_element);
}
-static inline struct kobject *sysfs_get_kobject(struct dentry *dentry)
-{
- struct kobject * kobj = NULL;
-
- spin_lock(&dcache_lock);
- if (!d_unhashed(dentry)) {
- struct sysfs_dirent * sd = dentry->d_fsdata;
- if (sd->s_type == SYSFS_ATTR_GROUP) {
- sd = dentry->d_parent->d_fsdata;
- BUG_ON(sd->s_type != SYSFS_DIR);
- }
- if (sd->s_type & SYSFS_KOBJ_LINK) {
- struct sysfs_symlink * sl = sd->s_element;
- kobj = kobject_get(sl->target_kobj);
- } else
- kobj = kobject_get(sd->s_element);
- }
- spin_unlock(&dcache_lock);
-
- return kobj;
-}
-
-static inline void release_sysfs_dirent(struct sysfs_dirent * sd)
-{
- if (sd->s_type & SYSFS_KOBJ_LINK) {
- struct sysfs_symlink * sl = sd->s_element;
- kfree(sl->link_name);
- kobject_put(sl->target_kobj);
- kfree(sl);
- }
- if (sysfs_type_dir(sd->s_type))
- kmem_cache_free(sysfs_dir_cachep, to_sysfs_dir(sd));
- else
- kmem_cache_free(sysfs_dirent_cachep, sd);
-}
+extern struct kobject *sysfs_get_kobject(struct dentry *dentry);
+extern void release_sysfs_dirent(struct sysfs_dirent * sd);
static inline void sysfs_put(struct sysfs_dirent * sd)
{
next reply other threads:[~2004-12-09 5:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-12-09 5:26 Adam J. Richter [this message]
2004-12-30 13:35 ` [fake patch] un-inline sysfs_get_kobject and release_sysfs_dirent Maneesh Soni
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=200412090526.iB95QWs27140@adam.yggdrasil.com \
--to=adam@yggdrasil.com \
--cc=akpm@osdl.org \
--cc=chrisw@osdl.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maneesh@in.ibm.com \
--cc=viro@parcelfarce.linux.theplanet.co.uk \
/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;
as well as URLs for NNTP newsgroup(s).