lkml.org 
[lkml]   [2003]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: PATCPATCH -- add unlimited name lengths support to sysfs
Greg KH wrote:
> On Wed, Dec 17, 2003 at 02:27:57PM -0600, Linda Xie wrote:
>
>>Greg KH wrote:
>>
>>>On Tue, Dec 16, 2003 at 05:07:22PM -0600, Linda Xie wrote:
>>>
>>>
>>>>diff -Nru a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
>>>>--- a/fs/sysfs/symlink.c Sun Dec 14 21:19:29 2003
>>>>+++ b/fs/sysfs/symlink.c Sun Dec 14 21:19:29 2003
>>>>@@ -42,7 +42,10 @@
>>>> struct kobject * p = kobj;
>>>> int length = 1;
>>>> do {
>>>>- length += strlen(p->name) + 1;
>>>>+ if (p->k_name)
>>>>+ length += strlen(p->k_name) + 1;
>>>>+ else
>>>>+ length += strlen(p->name) + 1;
>>>
>>>
>>>Shouldn't this just be:
>>> length += strlen(kobject_name(p)) + 1;
>>>
>>
>>That is correct. But here is my concern: Some of the callers of
>>sysfs_create_link()
>>set p->name instead of p->k_name. So for them, the length calculated
>>using kobject_name(p) will be incorrect. Correct me if I am wrong.
>
>
> Well if a kobject only uses the .name field, .k_name will point to it
> (see kobject_add()), so the kobject_name() call will work in the above
> case (as it should always do.) Actually that if (p->k_name) statement
> will always be true because of this fact :)
>
> This lets people like the edd driver which does:
> snprintf(edev->kobj.name, EDD_DEVICE_NAME_SIZE, "int13_dev%02x", edd[i].device);
> still work properly. Ideally, callers like this should change to use
> the kobject_set_name() function, but there's no rush.
>
> thanks,
>
> greg k-h
>

Thank you very much. Below is an updated patch:


diff -Nru a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
--- a/fs/sysfs/symlink.c Wed Dec 17 20:08:01 2003
+++ b/fs/sysfs/symlink.c Wed Dec 17 20:08:01 2003
@@ -42,7 +42,7 @@
struct kobject * p = kobj;
int length = 1;
do {
- length += strlen(p->name) + 1;
+ length += strlen(kobject_name(p)) + 1;
p = p->parent;
} while (p);
return length;
@@ -54,11 +54,11 @@

--length;
for (p = kobj; p; p = p->parent) {
- int cur = strlen(p->name);
+ int cur = strlen(kobject_name(p));

/* back up enough to print this bus id with '/' */
length -= cur;
- strncpy(buffer + length,p->name,cur);
+ strncpy(buffer + length,kobject_name(p),cur);
*(buffer + --length) = '/';
}

Linda




-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:59    [W:0.090 / U:0.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site