[v9,24/24] xfs: Rename __xfs_attr_rmtval_remove

Message ID	20200430225016.4287-25-allison.henderson@oracle.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <SRS0=AYd8=6O=vger.kernel.org=linux-xfs-owner@kernel.org> From: Allison Collins <allison.henderson@oracle.com> To: linux-xfs@vger.kernel.org Subject: [PATCH v9 24/24] xfs: Rename __xfs_attr_rmtval_remove Date: Thu, 30 Apr 2020 15:50:16 -0700 Message-Id: <20200430225016.4287-25-allison.henderson@oracle.com> In-Reply-To: <20200430225016.4287-1-allison.henderson@oracle.com> References: <20200430225016.4287-1-allison.henderson@oracle.com> Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk
Series	xfs: Delay Ready Attributes \| expand [v9,00/24] xfs: Delay Ready Attributes [v9,01/24] xfs: Add xfs_has_attr and subroutines [v9,02/24] xfs: Check for -ENOATTR or -EEXIST [v9,03/24] xfs: Factor out new helper functions xfs_attr_rmtval_set [v9,04/24] xfs: Pull up trans handling in xfs_attr3_leaf_flipflags [v9,05/24] xfs: Split apart xfs_attr_leaf_addname [v9,06/24] xfs: Refactor xfs_attr_try_sf_addname [v9,07/24] xfs: Pull up trans roll from xfs_attr3_leaf_setflag [v9,08/24] xfs: Factor out xfs_attr_rmtval_invalidate [v9,09/24] xfs: Pull up trans roll in xfs_attr3_leaf_clearflag [v9,10/24] xfs: Add helper function __xfs_attr_rmtval_remove [v9,11/24] xfs: Pull up xfs_attr_rmtval_invalidate [v9,12/24] xfs: Add helper function xfs_attr_node_shrink [v9,13/24] xfs: Remove unneeded xfs_trans_roll_inode calls [v9,14/24] xfs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform [v9,15/24] xfs: Add helper function xfs_attr_leaf_mark_incomplete [v9,16/24] xfs: Add remote block helper functions [v9,17/24] xfs: Add helper function xfs_attr_node_removename_setup [v9,18/24] xfs: Add helper function xfs_attr_node_removename_rmt [v9,19/24] xfs: Simplify xfs_attr_leaf_addname [v9,20/24] xfs: Simplify xfs_attr_node_addname [v9,21/24] xfs: Lift -ENOSPC handler from xfs_attr_leaf_addname [v9,22/24] xfs: Add delay ready attr remove routines [v9,23/24] xfs: Add delay ready attr set routines [v9,24/24] xfs: Rename __xfs_attr_rmtval_remove

Message ID

20200430225016.4287-25-allison.henderson@oracle.com (mailing list archive)

State

Superseded

Headers

From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v9 24/24] xfs: Rename __xfs_attr_rmtval_remove
Date: Thu, 30 Apr 2020 15:50:16 -0700
Message-Id: <20200430225016.4287-25-allison.henderson@oracle.com>
In-Reply-To: <20200430225016.4287-1-allison.henderson@oracle.com>
References: <20200430225016.4287-1-allison.henderson@oracle.com>
Sender: linux-xfs-owner@vger.kernel.org
Precedence: bulk

Series

xfs: Delay Ready Attributes | expand

Commit Message

Allison Henderson April 30, 2020, 10:50 p.m. UTC

Now that xfs_attr_rmtval_remove is gone, rename __xfs_attr_rmtval_remove
to xfs_attr_rmtval_remove

Signed-off-by: Allison Collins <allison.henderson@oracle.com>
---
 fs/xfs/libxfs/xfs_attr.c        | 7 +++----
 fs/xfs/libxfs/xfs_attr_remote.c | 2 +-
 fs/xfs/libxfs/xfs_attr_remote.h | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

Comments

Darrick J. Wong May 4, 2020, 7:34 p.m. UTC | #1

On Thu, Apr 30, 2020 at 03:50:16PM -0700, Allison Collins wrote:
> Now that xfs_attr_rmtval_remove is gone, rename __xfs_attr_rmtval_remove
> to xfs_attr_rmtval_remove
> 
> Signed-off-by: Allison Collins <allison.henderson@oracle.com>

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  fs/xfs/libxfs/xfs_attr.c        | 7 +++----
>  fs/xfs/libxfs/xfs_attr_remote.c | 2 +-
>  fs/xfs/libxfs/xfs_attr_remote.h | 3 +--
>  3 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index 0751231..d76a970 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -874,7 +874,7 @@ xfs_attr_leaf_addname(
>  		return error;
>  das_rm_lblk:
>  	if (args->rmtblkno) {
> -		error = __xfs_attr_rmtval_remove(dac);
> +		error = xfs_attr_rmtval_remove(dac);
>  
>  		if (error == -EAGAIN) {
>  			dac->dela_state = XFS_DAS_RM_LBLK;
> @@ -1244,8 +1244,7 @@ xfs_attr_node_addname(
>  
>  das_rm_nblk:
>  	if (args->rmtblkno) {
> -		error = __xfs_attr_rmtval_remove(dac);
> -
> +		error = xfs_attr_rmtval_remove(dac);
>  		if (error == -EAGAIN) {
>  			dac->dela_state = XFS_DAS_RM_NBLK;
>  			return -EAGAIN;
> @@ -1409,7 +1408,7 @@ xfs_attr_node_removename_rmt (
>  	/*
>  	 * May return -EAGAIN to request that the caller recall this function
>  	 */
> -	error = __xfs_attr_rmtval_remove(dac);
> +	error = xfs_attr_rmtval_remove(dac);
>  	if (error)
>  		return error;
>  
> diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
> index 7a342f1..21c7aa9 100644
> --- a/fs/xfs/libxfs/xfs_attr_remote.c
> +++ b/fs/xfs/libxfs/xfs_attr_remote.c
> @@ -740,7 +740,7 @@ xfs_attr_rmtval_invalidate(
>   * transaction and recall the function
>   */
>  int
> -__xfs_attr_rmtval_remove(
> +xfs_attr_rmtval_remove(
>  	struct xfs_delattr_context	*dac)
>  {
>  	struct xfs_da_args		*args = dac->da_args;
> diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h
> index 51a1c91..09fda56 100644
> --- a/fs/xfs/libxfs/xfs_attr_remote.h
> +++ b/fs/xfs/libxfs/xfs_attr_remote.h
> @@ -10,11 +10,10 @@ int xfs_attr3_rmt_blocks(struct xfs_mount *mp, int attrlen);
>  
>  int xfs_attr_rmtval_get(struct xfs_da_args *args);
>  int xfs_attr_rmtval_set(struct xfs_da_args *args);
> -int xfs_attr_rmtval_remove(struct xfs_da_args *args);
>  int xfs_attr_rmtval_stale(struct xfs_inode *ip, struct xfs_bmbt_irec *map,
>  		xfs_buf_flags_t incore_flags);
>  int xfs_attr_rmtval_invalidate(struct xfs_da_args *args);
> -int __xfs_attr_rmtval_remove(struct xfs_delattr_context *dac);
> +int xfs_attr_rmtval_remove(struct xfs_delattr_context *dac);
>  int xfs_attr_rmt_find_hole(struct xfs_da_args *args);
>  int xfs_attr_rmtval_set_value(struct xfs_da_args *args);
>  int xfs_attr_rmtval_set_blk(struct xfs_delattr_context *dac);
> -- 
> 2.7.4
>

Allison Henderson May 5, 2020, 12:27 a.m. UTC | #2

On 5/4/20 12:34 PM, Darrick J. Wong wrote:
> On Thu, Apr 30, 2020 at 03:50:16PM -0700, Allison Collins wrote:
>> Now that xfs_attr_rmtval_remove is gone, rename __xfs_attr_rmtval_remove
>> to xfs_attr_rmtval_remove
>>
>> Signed-off-by: Allison Collins <allison.henderson@oracle.com>
> 
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
> 
Thanks!
Allison

> --D
> 
>> ---
>>   fs/xfs/libxfs/xfs_attr.c        | 7 +++----
>>   fs/xfs/libxfs/xfs_attr_remote.c | 2 +-
>>   fs/xfs/libxfs/xfs_attr_remote.h | 3 +--
>>   3 files changed, 5 insertions(+), 7 deletions(-)
>>
>> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
>> index 0751231..d76a970 100644
>> --- a/fs/xfs/libxfs/xfs_attr.c
>> +++ b/fs/xfs/libxfs/xfs_attr.c
>> @@ -874,7 +874,7 @@ xfs_attr_leaf_addname(
>>   		return error;
>>   das_rm_lblk:
>>   	if (args->rmtblkno) {
>> -		error = __xfs_attr_rmtval_remove(dac);
>> +		error = xfs_attr_rmtval_remove(dac);
>>   
>>   		if (error == -EAGAIN) {
>>   			dac->dela_state = XFS_DAS_RM_LBLK;
>> @@ -1244,8 +1244,7 @@ xfs_attr_node_addname(
>>   
>>   das_rm_nblk:
>>   	if (args->rmtblkno) {
>> -		error = __xfs_attr_rmtval_remove(dac);
>> -
>> +		error = xfs_attr_rmtval_remove(dac);
>>   		if (error == -EAGAIN) {
>>   			dac->dela_state = XFS_DAS_RM_NBLK;
>>   			return -EAGAIN;
>> @@ -1409,7 +1408,7 @@ xfs_attr_node_removename_rmt (
>>   	/*
>>   	 * May return -EAGAIN to request that the caller recall this function
>>   	 */
>> -	error = __xfs_attr_rmtval_remove(dac);
>> +	error = xfs_attr_rmtval_remove(dac);
>>   	if (error)
>>   		return error;
>>   
>> diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
>> index 7a342f1..21c7aa9 100644
>> --- a/fs/xfs/libxfs/xfs_attr_remote.c
>> +++ b/fs/xfs/libxfs/xfs_attr_remote.c
>> @@ -740,7 +740,7 @@ xfs_attr_rmtval_invalidate(
>>    * transaction and recall the function
>>    */
>>   int
>> -__xfs_attr_rmtval_remove(
>> +xfs_attr_rmtval_remove(
>>   	struct xfs_delattr_context	*dac)
>>   {
>>   	struct xfs_da_args		*args = dac->da_args;
>> diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h
>> index 51a1c91..09fda56 100644
>> --- a/fs/xfs/libxfs/xfs_attr_remote.h
>> +++ b/fs/xfs/libxfs/xfs_attr_remote.h
>> @@ -10,11 +10,10 @@ int xfs_attr3_rmt_blocks(struct xfs_mount *mp, int attrlen);
>>   
>>   int xfs_attr_rmtval_get(struct xfs_da_args *args);
>>   int xfs_attr_rmtval_set(struct xfs_da_args *args);
>> -int xfs_attr_rmtval_remove(struct xfs_da_args *args);
>>   int xfs_attr_rmtval_stale(struct xfs_inode *ip, struct xfs_bmbt_irec *map,
>>   		xfs_buf_flags_t incore_flags);
>>   int xfs_attr_rmtval_invalidate(struct xfs_da_args *args);
>> -int __xfs_attr_rmtval_remove(struct xfs_delattr_context *dac);
>> +int xfs_attr_rmtval_remove(struct xfs_delattr_context *dac);
>>   int xfs_attr_rmt_find_hole(struct xfs_da_args *args);
>>   int xfs_attr_rmtval_set_value(struct xfs_da_args *args);
>>   int xfs_attr_rmtval_set_blk(struct xfs_delattr_context *dac);
>> -- 
>> 2.7.4
>>

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 0751231..d76a970 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -874,7 +874,7 @@  xfs_attr_leaf_addname(
 		return error;
 das_rm_lblk:
 	if (args->rmtblkno) {
-		error = __xfs_attr_rmtval_remove(dac);
+		error = xfs_attr_rmtval_remove(dac);
 
 		if (error == -EAGAIN) {
 			dac->dela_state = XFS_DAS_RM_LBLK;
@@ -1244,8 +1244,7 @@  xfs_attr_node_addname(
 
 das_rm_nblk:
 	if (args->rmtblkno) {
-		error = __xfs_attr_rmtval_remove(dac);
-
+		error = xfs_attr_rmtval_remove(dac);
 		if (error == -EAGAIN) {
 			dac->dela_state = XFS_DAS_RM_NBLK;
 			return -EAGAIN;
@@ -1409,7 +1408,7 @@  xfs_attr_node_removename_rmt (
 	/*
 	 * May return -EAGAIN to request that the caller recall this function
 	 */
-	error = __xfs_attr_rmtval_remove(dac);
+	error = xfs_attr_rmtval_remove(dac);
 	if (error)
 		return error;
 
diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
index 7a342f1..21c7aa9 100644
--- a/fs/xfs/libxfs/xfs_attr_remote.c
+++ b/fs/xfs/libxfs/xfs_attr_remote.c
@@ -740,7 +740,7 @@  xfs_attr_rmtval_invalidate(
  * transaction and recall the function
  */
 int
-__xfs_attr_rmtval_remove(
+xfs_attr_rmtval_remove(
 	struct xfs_delattr_context	*dac)
 {
 	struct xfs_da_args		*args = dac->da_args;
diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h
index 51a1c91..09fda56 100644
--- a/fs/xfs/libxfs/xfs_attr_remote.h
+++ b/fs/xfs/libxfs/xfs_attr_remote.h
@@ -10,11 +10,10 @@  int xfs_attr3_rmt_blocks(struct xfs_mount *mp, int attrlen);
 
 int xfs_attr_rmtval_get(struct xfs_da_args *args);
 int xfs_attr_rmtval_set(struct xfs_da_args *args);
-int xfs_attr_rmtval_remove(struct xfs_da_args *args);
 int xfs_attr_rmtval_stale(struct xfs_inode *ip, struct xfs_bmbt_irec *map,
 		xfs_buf_flags_t incore_flags);
 int xfs_attr_rmtval_invalidate(struct xfs_da_args *args);
-int __xfs_attr_rmtval_remove(struct xfs_delattr_context *dac);
+int xfs_attr_rmtval_remove(struct xfs_delattr_context *dac);
 int xfs_attr_rmt_find_hole(struct xfs_da_args *args);
 int xfs_attr_rmtval_set_value(struct xfs_da_args *args);
 int xfs_attr_rmtval_set_blk(struct xfs_delattr_context *dac);

[v9,24/24] xfs: Rename __xfs_attr_rmtval_remove

Commit Message

Comments

Patch