diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-04 19:06:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:53:54 -0400 |
commit | c253ed1f6fd68df8542efed2d6b7656c3324f3e4 (patch) | |
tree | f6a311287161bbeabb93dab11ff54eda490831cd /fs/ocfs2 | |
parent | 6718cb5e0e75faa2b938dc1ee247fbd70136ccd7 (diff) |
fs/ocfs2/ioctl.c: add static to local functions
ocfs_info_foo() and ocfs2_get_request_ptr functions are only used in ioctl.c
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/ioctl.c | 81 |
1 files changed, 41 insertions, 40 deletions
diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c index 490229f43731..6f66b3751ace 100644 --- a/fs/ocfs2/ioctl.c +++ b/fs/ocfs2/ioctl.c | |||
@@ -143,8 +143,8 @@ bail: | |||
143 | return status; | 143 | return status; |
144 | } | 144 | } |
145 | 145 | ||
146 | int ocfs2_info_handle_blocksize(struct inode *inode, | 146 | static int ocfs2_info_handle_blocksize(struct inode *inode, |
147 | struct ocfs2_info_request __user *req) | 147 | struct ocfs2_info_request __user *req) |
148 | { | 148 | { |
149 | int status = -EFAULT; | 149 | int status = -EFAULT; |
150 | struct ocfs2_info_blocksize oib; | 150 | struct ocfs2_info_blocksize oib; |
@@ -167,8 +167,8 @@ bail: | |||
167 | return status; | 167 | return status; |
168 | } | 168 | } |
169 | 169 | ||
170 | int ocfs2_info_handle_clustersize(struct inode *inode, | 170 | static int ocfs2_info_handle_clustersize(struct inode *inode, |
171 | struct ocfs2_info_request __user *req) | 171 | struct ocfs2_info_request __user *req) |
172 | { | 172 | { |
173 | int status = -EFAULT; | 173 | int status = -EFAULT; |
174 | struct ocfs2_info_clustersize oic; | 174 | struct ocfs2_info_clustersize oic; |
@@ -192,8 +192,8 @@ bail: | |||
192 | return status; | 192 | return status; |
193 | } | 193 | } |
194 | 194 | ||
195 | int ocfs2_info_handle_maxslots(struct inode *inode, | 195 | static int ocfs2_info_handle_maxslots(struct inode *inode, |
196 | struct ocfs2_info_request __user *req) | 196 | struct ocfs2_info_request __user *req) |
197 | { | 197 | { |
198 | int status = -EFAULT; | 198 | int status = -EFAULT; |
199 | struct ocfs2_info_maxslots oim; | 199 | struct ocfs2_info_maxslots oim; |
@@ -217,8 +217,8 @@ bail: | |||
217 | return status; | 217 | return status; |
218 | } | 218 | } |
219 | 219 | ||
220 | int ocfs2_info_handle_label(struct inode *inode, | 220 | static int ocfs2_info_handle_label(struct inode *inode, |
221 | struct ocfs2_info_request __user *req) | 221 | struct ocfs2_info_request __user *req) |
222 | { | 222 | { |
223 | int status = -EFAULT; | 223 | int status = -EFAULT; |
224 | struct ocfs2_info_label oil; | 224 | struct ocfs2_info_label oil; |
@@ -242,8 +242,8 @@ bail: | |||
242 | return status; | 242 | return status; |
243 | } | 243 | } |
244 | 244 | ||
245 | int ocfs2_info_handle_uuid(struct inode *inode, | 245 | static int ocfs2_info_handle_uuid(struct inode *inode, |
246 | struct ocfs2_info_request __user *req) | 246 | struct ocfs2_info_request __user *req) |
247 | { | 247 | { |
248 | int status = -EFAULT; | 248 | int status = -EFAULT; |
249 | struct ocfs2_info_uuid oiu; | 249 | struct ocfs2_info_uuid oiu; |
@@ -267,8 +267,8 @@ bail: | |||
267 | return status; | 267 | return status; |
268 | } | 268 | } |
269 | 269 | ||
270 | int ocfs2_info_handle_fs_features(struct inode *inode, | 270 | static int ocfs2_info_handle_fs_features(struct inode *inode, |
271 | struct ocfs2_info_request __user *req) | 271 | struct ocfs2_info_request __user *req) |
272 | { | 272 | { |
273 | int status = -EFAULT; | 273 | int status = -EFAULT; |
274 | struct ocfs2_info_fs_features oif; | 274 | struct ocfs2_info_fs_features oif; |
@@ -294,8 +294,8 @@ bail: | |||
294 | return status; | 294 | return status; |
295 | } | 295 | } |
296 | 296 | ||
297 | int ocfs2_info_handle_journal_size(struct inode *inode, | 297 | static int ocfs2_info_handle_journal_size(struct inode *inode, |
298 | struct ocfs2_info_request __user *req) | 298 | struct ocfs2_info_request __user *req) |
299 | { | 299 | { |
300 | int status = -EFAULT; | 300 | int status = -EFAULT; |
301 | struct ocfs2_info_journal_size oij; | 301 | struct ocfs2_info_journal_size oij; |
@@ -319,9 +319,10 @@ bail: | |||
319 | return status; | 319 | return status; |
320 | } | 320 | } |
321 | 321 | ||
322 | int ocfs2_info_scan_inode_alloc(struct ocfs2_super *osb, | 322 | static int ocfs2_info_scan_inode_alloc(struct ocfs2_super *osb, |
323 | struct inode *inode_alloc, u64 blkno, | 323 | struct inode *inode_alloc, u64 blkno, |
324 | struct ocfs2_info_freeinode *fi, u32 slot) | 324 | struct ocfs2_info_freeinode *fi, |
325 | u32 slot) | ||
325 | { | 326 | { |
326 | int status = 0, unlock = 0; | 327 | int status = 0, unlock = 0; |
327 | 328 | ||
@@ -366,8 +367,8 @@ bail: | |||
366 | return status; | 367 | return status; |
367 | } | 368 | } |
368 | 369 | ||
369 | int ocfs2_info_handle_freeinode(struct inode *inode, | 370 | static int ocfs2_info_handle_freeinode(struct inode *inode, |
370 | struct ocfs2_info_request __user *req) | 371 | struct ocfs2_info_request __user *req) |
371 | { | 372 | { |
372 | u32 i; | 373 | u32 i; |
373 | u64 blkno = -1; | 374 | u64 blkno = -1; |
@@ -462,19 +463,19 @@ static void o2ffg_update_stats(struct ocfs2_info_freefrag_stats *stats, | |||
462 | stats->ffs_free_chunks_real++; | 463 | stats->ffs_free_chunks_real++; |
463 | } | 464 | } |
464 | 465 | ||
465 | void ocfs2_info_update_ffg(struct ocfs2_info_freefrag *ffg, | 466 | static void ocfs2_info_update_ffg(struct ocfs2_info_freefrag *ffg, |
466 | unsigned int chunksize) | 467 | unsigned int chunksize) |
467 | { | 468 | { |
468 | o2ffg_update_histogram(&(ffg->iff_ffs.ffs_fc_hist), chunksize); | 469 | o2ffg_update_histogram(&(ffg->iff_ffs.ffs_fc_hist), chunksize); |
469 | o2ffg_update_stats(&(ffg->iff_ffs), chunksize); | 470 | o2ffg_update_stats(&(ffg->iff_ffs), chunksize); |
470 | } | 471 | } |
471 | 472 | ||
472 | int ocfs2_info_freefrag_scan_chain(struct ocfs2_super *osb, | 473 | static int ocfs2_info_freefrag_scan_chain(struct ocfs2_super *osb, |
473 | struct inode *gb_inode, | 474 | struct inode *gb_inode, |
474 | struct ocfs2_dinode *gb_dinode, | 475 | struct ocfs2_dinode *gb_dinode, |
475 | struct ocfs2_chain_rec *rec, | 476 | struct ocfs2_chain_rec *rec, |
476 | struct ocfs2_info_freefrag *ffg, | 477 | struct ocfs2_info_freefrag *ffg, |
477 | u32 chunks_in_group) | 478 | u32 chunks_in_group) |
478 | { | 479 | { |
479 | int status = 0, used; | 480 | int status = 0, used; |
480 | u64 blkno; | 481 | u64 blkno; |
@@ -572,9 +573,9 @@ bail: | |||
572 | return status; | 573 | return status; |
573 | } | 574 | } |
574 | 575 | ||
575 | int ocfs2_info_freefrag_scan_bitmap(struct ocfs2_super *osb, | 576 | static int ocfs2_info_freefrag_scan_bitmap(struct ocfs2_super *osb, |
576 | struct inode *gb_inode, u64 blkno, | 577 | struct inode *gb_inode, u64 blkno, |
577 | struct ocfs2_info_freefrag *ffg) | 578 | struct ocfs2_info_freefrag *ffg) |
578 | { | 579 | { |
579 | u32 chunks_in_group; | 580 | u32 chunks_in_group; |
580 | int status = 0, unlock = 0, i; | 581 | int status = 0, unlock = 0, i; |
@@ -652,8 +653,8 @@ bail: | |||
652 | return status; | 653 | return status; |
653 | } | 654 | } |
654 | 655 | ||
655 | int ocfs2_info_handle_freefrag(struct inode *inode, | 656 | static int ocfs2_info_handle_freefrag(struct inode *inode, |
656 | struct ocfs2_info_request __user *req) | 657 | struct ocfs2_info_request __user *req) |
657 | { | 658 | { |
658 | u64 blkno = -1; | 659 | u64 blkno = -1; |
659 | char namebuf[40]; | 660 | char namebuf[40]; |
@@ -723,8 +724,8 @@ out_err: | |||
723 | return status; | 724 | return status; |
724 | } | 725 | } |
725 | 726 | ||
726 | int ocfs2_info_handle_unknown(struct inode *inode, | 727 | static int ocfs2_info_handle_unknown(struct inode *inode, |
727 | struct ocfs2_info_request __user *req) | 728 | struct ocfs2_info_request __user *req) |
728 | { | 729 | { |
729 | int status = -EFAULT; | 730 | int status = -EFAULT; |
730 | struct ocfs2_info_request oir; | 731 | struct ocfs2_info_request oir; |
@@ -752,8 +753,8 @@ bail: | |||
752 | * - distinguish different requests. | 753 | * - distinguish different requests. |
753 | * - validate size of different requests. | 754 | * - validate size of different requests. |
754 | */ | 755 | */ |
755 | int ocfs2_info_handle_request(struct inode *inode, | 756 | static int ocfs2_info_handle_request(struct inode *inode, |
756 | struct ocfs2_info_request __user *req) | 757 | struct ocfs2_info_request __user *req) |
757 | { | 758 | { |
758 | int status = -EFAULT; | 759 | int status = -EFAULT; |
759 | struct ocfs2_info_request oir; | 760 | struct ocfs2_info_request oir; |
@@ -811,8 +812,8 @@ bail: | |||
811 | return status; | 812 | return status; |
812 | } | 813 | } |
813 | 814 | ||
814 | int ocfs2_get_request_ptr(struct ocfs2_info *info, int idx, | 815 | static int ocfs2_get_request_ptr(struct ocfs2_info *info, int idx, |
815 | u64 *req_addr, int compat_flag) | 816 | u64 *req_addr, int compat_flag) |
816 | { | 817 | { |
817 | int status = -EFAULT; | 818 | int status = -EFAULT; |
818 | u64 __user *bp = NULL; | 819 | u64 __user *bp = NULL; |
@@ -849,8 +850,8 @@ bail: | |||
849 | * a better backward&forward compatibility, since a small piece of | 850 | * a better backward&forward compatibility, since a small piece of |
850 | * request will be less likely to be broken if disk layout get changed. | 851 | * request will be less likely to be broken if disk layout get changed. |
851 | */ | 852 | */ |
852 | int ocfs2_info_handle(struct inode *inode, struct ocfs2_info *info, | 853 | static int ocfs2_info_handle(struct inode *inode, struct ocfs2_info *info, |
853 | int compat_flag) | 854 | int compat_flag) |
854 | { | 855 | { |
855 | int i, status = 0; | 856 | int i, status = 0; |
856 | u64 req_addr; | 857 | u64 req_addr; |