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>

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 6ee94bc23f5b106421eaff374d3dc7aa5df9deac..a2a8603d27e0c1fc8cb1f4261ebe0a3ee6c36908 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -563,8 +563,8 @@ int ocfs2_add_inode_data(struct ocfs2_super *osb,
        return ret;
 }
 
-static int __ocfs2_extend_allocation(struct inode *inode, u32 logical_start,
-                                    u32 clusters_to_add, int mark_unwritten)
+static int ocfs2_extend_allocation(struct inode *inode, u32 logical_start,
+                                  u32 clusters_to_add, int mark_unwritten)
 {
        int status = 0;
        int restart_func = 0;
@@ -1035,8 +1035,8 @@ int ocfs2_extend_no_holes(struct inode *inode, struct buffer_head *di_bh,
                clusters_to_add -= oi->ip_clusters;
 
        if (clusters_to_add) {
-               ret = __ocfs2_extend_allocation(inode, oi->ip_clusters,
-                                               clusters_to_add, 0);
+               ret = ocfs2_extend_allocation(inode, oi->ip_clusters,
+                                             clusters_to_add, 0);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -1493,7 +1493,7 @@ static int ocfs2_allocate_unwritten_extents(struct inode *inode,
                        goto next;
                }
 
-               ret = __ocfs2_extend_allocation(inode, cpos, alloc_size, 1);
+               ret = ocfs2_extend_allocation(inode, cpos, alloc_size, 1);
                if (ret) {
                        if (ret != -ENOSPC)
                                mlog_errno(ret);

diff --git a/fs/ocfs2/file.h b/fs/ocfs2/file.h
index 1fdc9839cd931d911a586c85cf4093d132b06637..7eb7f03531f6bf92e3e29493bd3217dfe36d1c7d 100644 (file)
--- a/fs/ocfs2/file.h
+++ b/fs/ocfs2/file.h
@@ -65,8 +65,6 @@ int ocfs2_extend_no_holes(struct inode *inode, struct buffer_head *di_bh,
                          u64 new_i_size, u64 zero_to);
 int ocfs2_zero_extend(struct inode *inode, struct buffer_head *di_bh,
                      loff_t zero_to);
-int ocfs2_extend_allocation(struct inode *inode, u32 logical_start,
-               u32 clusters_to_add, int mark_unwritten);
 int ocfs2_setattr(struct dentry *dentry, struct iattr *attr);
 int ocfs2_getattr(const struct path *path, struct kstat *stat,
                  u32 request_mask, unsigned int flags);