aboutsummaryrefslogtreecommitdiffstats
path: root/fs/sysfs
diff options
context:
space:
mode:
authorTom Goff <thomas.goff@boeing.com>2012-04-04 15:06:20 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-09 18:33:00 -0400
commit70fa4a62e913dde2d100e0be2711562742f58bee (patch)
tree272c4c79fd02fe89d628ef3ba12efc812184f179 /fs/sysfs
parent3a4ffe930a2d2dad07604fe74d21b878decc6461 (diff)
sysfs: Update the name hash for an entry after changing the namespace
This is needed to allow renaming network devices that have been moved to another network namespace. Signed-off-by: Tom Goff <thomas.goff@boeing.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/sysfs')
-rw-r--r--fs/sysfs/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 2a7a3f5d1ca6..8ddc1021c79a 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -878,7 +878,6 @@ int sysfs_rename(struct sysfs_dirent *sd,
878 878
879 dup_name = sd->s_name; 879 dup_name = sd->s_name;
880 sd->s_name = new_name; 880 sd->s_name = new_name;
881 sd->s_hash = sysfs_name_hash(sd->s_ns, sd->s_name);
882 } 881 }
883 882
884 /* Move to the appropriate place in the appropriate directories rbtree. */ 883 /* Move to the appropriate place in the appropriate directories rbtree. */
@@ -886,6 +885,7 @@ int sysfs_rename(struct sysfs_dirent *sd,
886 sysfs_get(new_parent_sd); 885 sysfs_get(new_parent_sd);
887 sysfs_put(sd->s_parent); 886 sysfs_put(sd->s_parent);
888 sd->s_ns = new_ns; 887 sd->s_ns = new_ns;
888 sd->s_hash = sysfs_name_hash(sd->s_ns, sd->s_name);
889 sd->s_parent = new_parent_sd; 889 sd->s_parent = new_parent_sd;
890 sysfs_link_sibling(sd); 890 sysfs_link_sibling(sd);
891 891