diff options
author | James Morris <jmorris@namei.org> | 2009-06-18 08:00:05 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-06-24 10:09:12 -0400 |
commit | 86abcf9cebf7b5ceb33facde297face5ec4d2260 (patch) | |
tree | 1b71608a4c025882f82a952d56d0f546d461736b | |
parent | 20dda18be9035c487c2e9534e4d18d2a1e1deade (diff) |
keys: annotate seqfile ops with __releases and __acquires
Annotate seqfile ops with __releases and __acquires to stop sparse
complaining about unbalanced locking.
Signed-off-by: James Morris <jmorris@namei.org>
Reviewed-by: Serge Hallyn <serue@us.ibm.com>
-rw-r--r-- | security/keys/proc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/security/keys/proc.c b/security/keys/proc.c index 769f9bdfd2b3..39793c774f33 100644 --- a/security/keys/proc.c +++ b/security/keys/proc.c | |||
@@ -120,6 +120,7 @@ static int proc_keys_open(struct inode *inode, struct file *file) | |||
120 | } | 120 | } |
121 | 121 | ||
122 | static void *proc_keys_start(struct seq_file *p, loff_t *_pos) | 122 | static void *proc_keys_start(struct seq_file *p, loff_t *_pos) |
123 | __acquires(key_serial_lock) | ||
123 | { | 124 | { |
124 | struct rb_node *_p; | 125 | struct rb_node *_p; |
125 | loff_t pos = *_pos; | 126 | loff_t pos = *_pos; |
@@ -144,6 +145,7 @@ static void *proc_keys_next(struct seq_file *p, void *v, loff_t *_pos) | |||
144 | } | 145 | } |
145 | 146 | ||
146 | static void proc_keys_stop(struct seq_file *p, void *v) | 147 | static void proc_keys_stop(struct seq_file *p, void *v) |
148 | __releases(key_serial_lock) | ||
147 | { | 149 | { |
148 | spin_unlock(&key_serial_lock); | 150 | spin_unlock(&key_serial_lock); |
149 | } | 151 | } |
@@ -257,6 +259,7 @@ static int proc_key_users_open(struct inode *inode, struct file *file) | |||
257 | } | 259 | } |
258 | 260 | ||
259 | static void *proc_key_users_start(struct seq_file *p, loff_t *_pos) | 261 | static void *proc_key_users_start(struct seq_file *p, loff_t *_pos) |
262 | __acquires(key_user_lock) | ||
260 | { | 263 | { |
261 | struct rb_node *_p; | 264 | struct rb_node *_p; |
262 | loff_t pos = *_pos; | 265 | loff_t pos = *_pos; |
@@ -281,6 +284,7 @@ static void *proc_key_users_next(struct seq_file *p, void *v, loff_t *_pos) | |||
281 | } | 284 | } |
282 | 285 | ||
283 | static void proc_key_users_stop(struct seq_file *p, void *v) | 286 | static void proc_key_users_stop(struct seq_file *p, void *v) |
287 | __releases(key_user_lock) | ||
284 | { | 288 | { |
285 | spin_unlock(&key_user_lock); | 289 | spin_unlock(&key_user_lock); |
286 | } | 290 | } |