diff options
Diffstat (limited to 'net/ax25/ax25_uid.c')
-rw-r--r-- | net/ax25/ax25_uid.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/ax25/ax25_uid.c b/net/ax25/ax25_uid.c index 957999e43ff7..71c4badbc807 100644 --- a/net/ax25/ax25_uid.c +++ b/net/ax25/ax25_uid.c | |||
@@ -54,10 +54,9 @@ EXPORT_SYMBOL(ax25_uid_policy); | |||
54 | ax25_uid_assoc *ax25_findbyuid(kuid_t uid) | 54 | ax25_uid_assoc *ax25_findbyuid(kuid_t uid) |
55 | { | 55 | { |
56 | ax25_uid_assoc *ax25_uid, *res = NULL; | 56 | ax25_uid_assoc *ax25_uid, *res = NULL; |
57 | struct hlist_node *node; | ||
58 | 57 | ||
59 | read_lock(&ax25_uid_lock); | 58 | read_lock(&ax25_uid_lock); |
60 | ax25_uid_for_each(ax25_uid, node, &ax25_uid_list) { | 59 | ax25_uid_for_each(ax25_uid, &ax25_uid_list) { |
61 | if (uid_eq(ax25_uid->uid, uid)) { | 60 | if (uid_eq(ax25_uid->uid, uid)) { |
62 | ax25_uid_hold(ax25_uid); | 61 | ax25_uid_hold(ax25_uid); |
63 | res = ax25_uid; | 62 | res = ax25_uid; |
@@ -74,7 +73,6 @@ EXPORT_SYMBOL(ax25_findbyuid); | |||
74 | int ax25_uid_ioctl(int cmd, struct sockaddr_ax25 *sax) | 73 | int ax25_uid_ioctl(int cmd, struct sockaddr_ax25 *sax) |
75 | { | 74 | { |
76 | ax25_uid_assoc *ax25_uid; | 75 | ax25_uid_assoc *ax25_uid; |
77 | struct hlist_node *node; | ||
78 | ax25_uid_assoc *user; | 76 | ax25_uid_assoc *user; |
79 | unsigned long res; | 77 | unsigned long res; |
80 | 78 | ||
@@ -82,7 +80,7 @@ int ax25_uid_ioctl(int cmd, struct sockaddr_ax25 *sax) | |||
82 | case SIOCAX25GETUID: | 80 | case SIOCAX25GETUID: |
83 | res = -ENOENT; | 81 | res = -ENOENT; |
84 | read_lock(&ax25_uid_lock); | 82 | read_lock(&ax25_uid_lock); |
85 | ax25_uid_for_each(ax25_uid, node, &ax25_uid_list) { | 83 | ax25_uid_for_each(ax25_uid, &ax25_uid_list) { |
86 | if (ax25cmp(&sax->sax25_call, &ax25_uid->call) == 0) { | 84 | if (ax25cmp(&sax->sax25_call, &ax25_uid->call) == 0) { |
87 | res = from_kuid_munged(current_user_ns(), ax25_uid->uid); | 85 | res = from_kuid_munged(current_user_ns(), ax25_uid->uid); |
88 | break; | 86 | break; |
@@ -126,7 +124,7 @@ int ax25_uid_ioctl(int cmd, struct sockaddr_ax25 *sax) | |||
126 | 124 | ||
127 | ax25_uid = NULL; | 125 | ax25_uid = NULL; |
128 | write_lock(&ax25_uid_lock); | 126 | write_lock(&ax25_uid_lock); |
129 | ax25_uid_for_each(ax25_uid, node, &ax25_uid_list) { | 127 | ax25_uid_for_each(ax25_uid, &ax25_uid_list) { |
130 | if (ax25cmp(&sax->sax25_call, &ax25_uid->call) == 0) | 128 | if (ax25cmp(&sax->sax25_call, &ax25_uid->call) == 0) |
131 | break; | 129 | break; |
132 | } | 130 | } |
@@ -212,11 +210,10 @@ const struct file_operations ax25_uid_fops = { | |||
212 | void __exit ax25_uid_free(void) | 210 | void __exit ax25_uid_free(void) |
213 | { | 211 | { |
214 | ax25_uid_assoc *ax25_uid; | 212 | ax25_uid_assoc *ax25_uid; |
215 | struct hlist_node *node; | ||
216 | 213 | ||
217 | write_lock(&ax25_uid_lock); | 214 | write_lock(&ax25_uid_lock); |
218 | again: | 215 | again: |
219 | ax25_uid_for_each(ax25_uid, node, &ax25_uid_list) { | 216 | ax25_uid_for_each(ax25_uid, &ax25_uid_list) { |
220 | hlist_del_init(&ax25_uid->uid_node); | 217 | hlist_del_init(&ax25_uid->uid_node); |
221 | ax25_uid_put(ax25_uid); | 218 | ax25_uid_put(ax25_uid); |
222 | goto again; | 219 | goto again; |