aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/file.c
diff options
context:
space:
mode:
authorJia Guo <guojia12@huawei.com>2018-06-07 20:04:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-07 20:34:33 -0400
commit5bc55d654bdd679b8fee0ca7a3b180cbeaa4168d (patch)
treeba4192aedbe96abe0c4d019f10cc0da6a949b58c /fs/ocfs2/file.c
parent882ea1d64eb3956f7d877bcbc6370bd3c6d81543 (diff)
ocfs2: clean up redundant function declarations
ocfs2_extend_allocation() has been deleted, clean up its declaration. Also change the static function name from __ocfs2_extend_allocation() to ocfs2_extend_allocation() to be consistent with the corresponding trace events as well as comments for ocfs2_lock_allocators(). Link: http://lkml.kernel.org/r/09cf7125-6f12-e53e-20f5-e606b2c16b48@huawei.com Fixes: 964f14a0d350 ("ocfs2: clean up some dead code") Signed-off-by: Jia Guo <guojia12@huawei.com> Acked-by: Joseph Qi <jiangqi903@gmail.com> Reviewed-by: Jun Piao <piaojun@huawei.com> Cc: Mark Fasheh <mark@fasheh.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Junxiao Bi <junxiao.bi@oracle.com> Cc: Changwei Ge <ge.changwei@h3c.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2/file.c')
-rw-r--r--fs/ocfs2/file.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 6ee94bc23f5b..a2a8603d27e0 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -563,8 +563,8 @@ int ocfs2_add_inode_data(struct ocfs2_super *osb,
563 return ret; 563 return ret;
564} 564}
565 565
566static int __ocfs2_extend_allocation(struct inode *inode, u32 logical_start, 566static int ocfs2_extend_allocation(struct inode *inode, u32 logical_start,
567 u32 clusters_to_add, int mark_unwritten) 567 u32 clusters_to_add, int mark_unwritten)
568{ 568{
569 int status = 0; 569 int status = 0;
570 int restart_func = 0; 570 int restart_func = 0;
@@ -1035,8 +1035,8 @@ int ocfs2_extend_no_holes(struct inode *inode, struct buffer_head *di_bh,
1035 clusters_to_add -= oi->ip_clusters; 1035 clusters_to_add -= oi->ip_clusters;
1036 1036
1037 if (clusters_to_add) { 1037 if (clusters_to_add) {
1038 ret = __ocfs2_extend_allocation(inode, oi->ip_clusters, 1038 ret = ocfs2_extend_allocation(inode, oi->ip_clusters,
1039 clusters_to_add, 0); 1039 clusters_to_add, 0);
1040 if (ret) { 1040 if (ret) {
1041 mlog_errno(ret); 1041 mlog_errno(ret);
1042 goto out; 1042 goto out;
@@ -1493,7 +1493,7 @@ static int ocfs2_allocate_unwritten_extents(struct inode *inode,
1493 goto next; 1493 goto next;
1494 } 1494 }
1495 1495
1496 ret = __ocfs2_extend_allocation(inode, cpos, alloc_size, 1); 1496 ret = ocfs2_extend_allocation(inode, cpos, alloc_size, 1);
1497 if (ret) { 1497 if (ret) {
1498 if (ret != -ENOSPC) 1498 if (ret != -ENOSPC)
1499 mlog_errno(ret); 1499 mlog_errno(ret);