diff options
author | Satyam Sharma <ssatyam@cse.iitk.ac.in> | 2007-07-04 07:07:16 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2007-07-10 20:02:31 -0400 |
commit | 3fe6c5ce1176cf661dbe71fc43b627c1a742a89a (patch) | |
tree | be94563e2ba49f7116e866e57253b5ed82fb85ee /fs/dlm | |
parent | 9b1d9aa4e9c5cafe73b9df21d758b50b5d75264d (diff) |
[PATCH] configfs+dlm: Rename config_group_find_obj and state semantics clearly
Configfs being based upon sysfs code, config_group_find_obj() is probably
so named because of the similar kset_find_obj() in sysfs. However,
"kobject"s in sysfs become "config_item"s in configfs, so let's call it
config_group_find_item() instead, for sake of uniformity, and make
corresponding change in the users of this function.
BTW a crucial difference between kset_find_obj and config_group_find_item
is in locking expectations. kset_find_obj does its locking by itself, but
config_group_find_item expects the *caller* to do the locking. The reason
for this: kset's have their own locks, config_group's don't but instead
rely on the subsystem mutex. And, subsystem needn't necessarily be around
when config_group_find_item() is called.
So let's state these locking semantics explicitly, and rectify the comment,
otherwise bugs could continue to occur in future, as they did in the past
(refer commit d82b8191e238 in gfs2-2.6-fixes.git).
[ I also took the opportunity to fix some bad whitespace and
double-empty lines. --Joel ]
[ Conflict in fs/dlm/config.c with commit
3168b0780d06ace875696f8a648d04d6089654e5 manually resolved. --Mark ]
Signed-off-by: Satyam Sharma <ssatyam@cse.iitk.ac.in>
Cc: David Teigland <teigland@redhat.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/dlm')
-rw-r--r-- | fs/dlm/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/config.c b/fs/dlm/config.c index e47eb42406fa..4348cb42cf17 100644 --- a/fs/dlm/config.c +++ b/fs/dlm/config.c | |||
@@ -752,7 +752,7 @@ static struct space *get_space(char *name) | |||
752 | return NULL; | 752 | return NULL; |
753 | 753 | ||
754 | down(&space_list->cg_subsys->su_sem); | 754 | down(&space_list->cg_subsys->su_sem); |
755 | i = config_group_find_obj(space_list, name); | 755 | i = config_group_find_item(space_list, name); |
756 | up(&space_list->cg_subsys->su_sem); | 756 | up(&space_list->cg_subsys->su_sem); |
757 | 757 | ||
758 | return to_space(i); | 758 | return to_space(i); |