[Ocfs2-devel] [PATCH v3] ocfs2: clean up redundant function declarations

[Ocfs2-devel] [PATCH v3] ocfs2: clean up redundant function declarations

[Jia Guo]

The function 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().

Fixes: 964f14a0d350 ("ocfs2: clean up some dead code")

Signed-off-by: Jia Guo <guojia12@huawei.com>
Acked-by: Joseph Qi <jiangqi903@gmail.com>
---
 fs/ocfs2/file.c | 10 +++++-----
 fs/ocfs2/file.h |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 6ee94bc..a2a8603 100644
--- 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 1fdc983..7eb7f03 100644
--- 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);
-- 
.

[Ocfs2-devel] [PATCH v3] ocfs2: clean up redundant function declarations

[piaojun]

LGTM

On 2018/4/25 19:21, Jia Guo wrote:
> The function 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().
> 
> 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>
> ---
>  fs/ocfs2/file.c | 10 +++++-----
>  fs/ocfs2/file.h |  2 --
>  2 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
> index 6ee94bc..a2a8603 100644
> --- 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 1fdc983..7eb7f03 100644
> --- 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);
>