diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /fs/sysfs/dir.c | |
parent | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (diff) | |
parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
Diffstat (limited to 'fs/sysfs/dir.c')
-rw-r--r-- | fs/sysfs/dir.c | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index 82d3b79d0e08..66aeb4fff0c3 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c | |||
@@ -434,6 +434,26 @@ int __sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd) | |||
434 | } | 434 | } |
435 | 435 | ||
436 | /** | 436 | /** |
437 | * sysfs_pathname - return full path to sysfs dirent | ||
438 | * @sd: sysfs_dirent whose path we want | ||
439 | * @path: caller allocated buffer | ||
440 | * | ||
441 | * Gives the name "/" to the sysfs_root entry; any path returned | ||
442 | * is relative to wherever sysfs is mounted. | ||
443 | * | ||
444 | * XXX: does no error checking on @path size | ||
445 | */ | ||
446 | static char *sysfs_pathname(struct sysfs_dirent *sd, char *path) | ||
447 | { | ||
448 | if (sd->s_parent) { | ||
449 | sysfs_pathname(sd->s_parent, path); | ||
450 | strcat(path, "/"); | ||
451 | } | ||
452 | strcat(path, sd->s_name); | ||
453 | return path; | ||
454 | } | ||
455 | |||
456 | /** | ||
437 | * sysfs_add_one - add sysfs_dirent to parent | 457 | * sysfs_add_one - add sysfs_dirent to parent |
438 | * @acxt: addrm context to use | 458 | * @acxt: addrm context to use |
439 | * @sd: sysfs_dirent to be added | 459 | * @sd: sysfs_dirent to be added |
@@ -458,8 +478,16 @@ int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd) | |||
458 | int ret; | 478 | int ret; |
459 | 479 | ||
460 | ret = __sysfs_add_one(acxt, sd); | 480 | ret = __sysfs_add_one(acxt, sd); |
461 | WARN(ret == -EEXIST, KERN_WARNING "sysfs: duplicate filename '%s' " | 481 | if (ret == -EEXIST) { |
462 | "can not be created\n", sd->s_name); | 482 | char *path = kzalloc(PATH_MAX, GFP_KERNEL); |
483 | WARN(1, KERN_WARNING | ||
484 | "sysfs: cannot create duplicate filename '%s'\n", | ||
485 | (path == NULL) ? sd->s_name : | ||
486 | strcat(strcat(sysfs_pathname(acxt->parent_sd, path), "/"), | ||
487 | sd->s_name)); | ||
488 | kfree(path); | ||
489 | } | ||
490 | |||
463 | return ret; | 491 | return ret; |
464 | } | 492 | } |
465 | 493 | ||
@@ -581,6 +609,7 @@ void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt) | |||
581 | 609 | ||
582 | sysfs_drop_dentry(sd); | 610 | sysfs_drop_dentry(sd); |
583 | sysfs_deactivate(sd); | 611 | sysfs_deactivate(sd); |
612 | unmap_bin_file(sd); | ||
584 | sysfs_put(sd); | 613 | sysfs_put(sd); |
585 | } | 614 | } |
586 | } | 615 | } |