diff options
author | Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> | 2009-06-02 01:23:39 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-06-02 17:50:06 -0400 |
commit | ab588ccadc80f6ef5495e83e176e88c5c0fc2d0e (patch) | |
tree | ffb995eba759218fd07795f00a1303518621c119 /security/tomoyo/file.c | |
parent | 850b0cee165576f969363a8c52021b5cf9ecbe67 (diff) |
TOMOYO: Remove redundant markers.
Remove '/***** START/STOP *****/' markers.
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/tomoyo/file.c')
-rw-r--r-- | security/tomoyo/file.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c index 2316da8ec5bc..adf786d7421d 100644 --- a/security/tomoyo/file.c +++ b/security/tomoyo/file.c | |||
@@ -166,7 +166,6 @@ static int tomoyo_update_globally_readable_entry(const char *filename, | |||
166 | saved_filename = tomoyo_save_name(filename); | 166 | saved_filename = tomoyo_save_name(filename); |
167 | if (!saved_filename) | 167 | if (!saved_filename) |
168 | return -ENOMEM; | 168 | return -ENOMEM; |
169 | /***** EXCLUSIVE SECTION START *****/ | ||
170 | down_write(&tomoyo_globally_readable_list_lock); | 169 | down_write(&tomoyo_globally_readable_list_lock); |
171 | list_for_each_entry(ptr, &tomoyo_globally_readable_list, list) { | 170 | list_for_each_entry(ptr, &tomoyo_globally_readable_list, list) { |
172 | if (ptr->filename != saved_filename) | 171 | if (ptr->filename != saved_filename) |
@@ -187,7 +186,6 @@ static int tomoyo_update_globally_readable_entry(const char *filename, | |||
187 | error = 0; | 186 | error = 0; |
188 | out: | 187 | out: |
189 | up_write(&tomoyo_globally_readable_list_lock); | 188 | up_write(&tomoyo_globally_readable_list_lock); |
190 | /***** EXCLUSIVE SECTION END *****/ | ||
191 | return error; | 189 | return error; |
192 | } | 190 | } |
193 | 191 | ||
@@ -284,7 +282,6 @@ static int tomoyo_update_file_pattern_entry(const char *pattern, | |||
284 | saved_pattern = tomoyo_save_name(pattern); | 282 | saved_pattern = tomoyo_save_name(pattern); |
285 | if (!saved_pattern) | 283 | if (!saved_pattern) |
286 | return -ENOMEM; | 284 | return -ENOMEM; |
287 | /***** EXCLUSIVE SECTION START *****/ | ||
288 | down_write(&tomoyo_pattern_list_lock); | 285 | down_write(&tomoyo_pattern_list_lock); |
289 | list_for_each_entry(ptr, &tomoyo_pattern_list, list) { | 286 | list_for_each_entry(ptr, &tomoyo_pattern_list, list) { |
290 | if (saved_pattern != ptr->pattern) | 287 | if (saved_pattern != ptr->pattern) |
@@ -305,7 +302,6 @@ static int tomoyo_update_file_pattern_entry(const char *pattern, | |||
305 | error = 0; | 302 | error = 0; |
306 | out: | 303 | out: |
307 | up_write(&tomoyo_pattern_list_lock); | 304 | up_write(&tomoyo_pattern_list_lock); |
308 | /***** EXCLUSIVE SECTION END *****/ | ||
309 | return error; | 305 | return error; |
310 | } | 306 | } |
311 | 307 | ||
@@ -407,7 +403,6 @@ static int tomoyo_update_no_rewrite_entry(const char *pattern, | |||
407 | saved_pattern = tomoyo_save_name(pattern); | 403 | saved_pattern = tomoyo_save_name(pattern); |
408 | if (!saved_pattern) | 404 | if (!saved_pattern) |
409 | return -ENOMEM; | 405 | return -ENOMEM; |
410 | /***** EXCLUSIVE SECTION START *****/ | ||
411 | down_write(&tomoyo_no_rewrite_list_lock); | 406 | down_write(&tomoyo_no_rewrite_list_lock); |
412 | list_for_each_entry(ptr, &tomoyo_no_rewrite_list, list) { | 407 | list_for_each_entry(ptr, &tomoyo_no_rewrite_list, list) { |
413 | if (ptr->pattern != saved_pattern) | 408 | if (ptr->pattern != saved_pattern) |
@@ -428,7 +423,6 @@ static int tomoyo_update_no_rewrite_entry(const char *pattern, | |||
428 | error = 0; | 423 | error = 0; |
429 | out: | 424 | out: |
430 | up_write(&tomoyo_no_rewrite_list_lock); | 425 | up_write(&tomoyo_no_rewrite_list_lock); |
431 | /***** EXCLUSIVE SECTION END *****/ | ||
432 | return error; | 426 | return error; |
433 | } | 427 | } |
434 | 428 | ||
@@ -745,7 +739,6 @@ static int tomoyo_update_single_path_acl(const u8 type, const char *filename, | |||
745 | saved_filename = tomoyo_save_name(filename); | 739 | saved_filename = tomoyo_save_name(filename); |
746 | if (!saved_filename) | 740 | if (!saved_filename) |
747 | return -ENOMEM; | 741 | return -ENOMEM; |
748 | /***** EXCLUSIVE SECTION START *****/ | ||
749 | down_write(&tomoyo_domain_acl_info_list_lock); | 742 | down_write(&tomoyo_domain_acl_info_list_lock); |
750 | if (is_delete) | 743 | if (is_delete) |
751 | goto delete; | 744 | goto delete; |
@@ -800,7 +793,6 @@ static int tomoyo_update_single_path_acl(const u8 type, const char *filename, | |||
800 | } | 793 | } |
801 | out: | 794 | out: |
802 | up_write(&tomoyo_domain_acl_info_list_lock); | 795 | up_write(&tomoyo_domain_acl_info_list_lock); |
803 | /***** EXCLUSIVE SECTION END *****/ | ||
804 | return error; | 796 | return error; |
805 | } | 797 | } |
806 | 798 | ||
@@ -836,7 +828,6 @@ static int tomoyo_update_double_path_acl(const u8 type, const char *filename1, | |||
836 | saved_filename2 = tomoyo_save_name(filename2); | 828 | saved_filename2 = tomoyo_save_name(filename2); |
837 | if (!saved_filename1 || !saved_filename2) | 829 | if (!saved_filename1 || !saved_filename2) |
838 | return -ENOMEM; | 830 | return -ENOMEM; |
839 | /***** EXCLUSIVE SECTION START *****/ | ||
840 | down_write(&tomoyo_domain_acl_info_list_lock); | 831 | down_write(&tomoyo_domain_acl_info_list_lock); |
841 | if (is_delete) | 832 | if (is_delete) |
842 | goto delete; | 833 | goto delete; |
@@ -884,7 +875,6 @@ static int tomoyo_update_double_path_acl(const u8 type, const char *filename1, | |||
884 | } | 875 | } |
885 | out: | 876 | out: |
886 | up_write(&tomoyo_domain_acl_info_list_lock); | 877 | up_write(&tomoyo_domain_acl_info_list_lock); |
887 | /***** EXCLUSIVE SECTION END *****/ | ||
888 | return error; | 878 | return error; |
889 | } | 879 | } |
890 | 880 | ||