xfs: fix xfs_init_attr_trans not handling explicit operation codes
PATCH 1/1 xfs: fix xfs_init_attr_trans not handling explicit operation codes
From: Darrick J. Wong <[email protected]>
When we were converting the attr code to use an explicit operation code instead of keying off of attr->value being null, we forgot to change the code that initializes the transaction reservation. Split the function into two helpers that handle the !remove and remove cases, then fix both callsites to handle this correctly.
--- fs/xfs/libxfs/xfs_attr.c | 40 +++++++++++++++++++++++----------------- fs/xfs/libxfs/xfs_attr.h | 6 ++++-- fs/xfs/xfs_attr_item.c | 15 +++++++++++++-- 3 files changed, 40 insertions(+), 21 deletions(-)
fs/xfs/libxfs/xfs_attr.c +23 -17
@@ -339,26 +339,31 @@ xfs_attr_calc_size(return nblks; } -/* Initialize transaction reservation for attr operations */ -void -xfs_init_attr_trans ( +/* Initialize transaction reservation for an xattr set/replace/upsert */ +unsigned int +xfs_attr_init_set_trans (struct xfs_da_args *args, -struct xfs_trans_res *tres, -unsigned int *total) +struct xfs_trans_res *tres) {struct xfs_mount *mp = args->dp->i_mount; -if (args->value) { - tres->tr_logres =M_RES (mp)->tr_attrsetm.tr_logres + -M_RES (mp)->tr_attrsetrt.tr_logres * - args->total; - tres->tr_logcount =XFS_ATTRSET_LOG_COUNT ; + tres->tr_logres =M_RES (mp)->tr_attrsetm.tr_logres + +M_RES (mp)->tr_attrsetrt.tr_logres * args->total; + tres->tr_logcount =XFS_ATTRSET_LOG_COUNT ; tres->tr_logflags =XFS_TRANS_PERM_LOG_RES ; - *total = args->total; - }else { - *tres =M_RES (mp)->tr_attrrm; - *total =XFS_ATTRRM_SPACE_RES (mp); - } +return args->total; +} + +/* Initialize transaction reservation for an xattr remove */ +unsigned int +xfs_attr_init_remove_trans ( +struct xfs_da_args *args, +struct xfs_trans_res *tres) +{ +struct xfs_mount *mp = args->dp->i_mount; + + *tres =M_RES (mp)->tr_attrrm; +return XFS_ATTRRM_SPACE_RES (mp); }/*
@@ -1021,7 +1026,7 @@ xfs_attr_set(struct xfs_trans_res tres;int error, local;int rmt_blks =0 ; -unsigned int total; +unsigned int total =0 ;ASSERT (!args->trans);
@@ -1049,10 +1054,12 @@ xfs_attr_set(if (!local) rmt_blks =xfs_attr3_rmt_blocks (mp, args->attr_filter, args->valuelen); + total =xfs_attr_init_set_trans (args, &tres);break ;case XFS_ATTRUPDATE_REMOVE :XFS_STATS_INC (mp, xs_attr_remove); rmt_blks =xfs_attr3_max_rmt_blocks (mp); + total =xfs_attr_init_remove_trans (args, &tres);break ; }
@@ -1060,7 +1067,6 @@ xfs_attr_set(* Root fork attributes can use reserved data blocks for this * operation if necessary */ -xfs_init_attr_trans (args, &tres, &total); error =xfs_trans_alloc_inode (dp, &tres, total,0 , rsvd, &args->trans);if (error)return error;
fs/xfs/libxfs/xfs_attr.h +4 -2
@@ -565,8 +565,10 @@ bool xfs_attr_check_namespace(unsigned int attr_flags);bool xfs_attr_namecheck (unsigned int attr_flags,const void *name,size_t length);int xfs_attr_calc_size (struct xfs_da_args *args,int *local); -void xfs_init_attr_trans (struct xfs_da_args *args,struct xfs_trans_res *tres, -unsigned int *total); +unsigned int xfs_attr_init_set_trans (struct xfs_da_args *args, +struct xfs_trans_res *tres); +unsigned int xfs_attr_init_remove_trans (struct xfs_da_args *args, +struct xfs_trans_res *tres);/* * Check to see if the attr should be upgraded from non-existent or shortform to
fs/xfs/xfs_attr_item.c +13 -2
@@ -746,7 +746,7 @@ xfs_attr_recover_work(struct xfs_attri_log_format *attrp;struct xfs_attri_log_nameval *nv = attrip->attri_nameval;int error; -int total; +unsigned int total =0 ;/* * First check the validity of the attr described by the ATTRI. If any
@@ -763,7 +763,18 @@ xfs_attr_recover_work(return PTR_ERR (attr); args = attr->xattri_da_args; -xfs_init_attr_trans (args, &resv, &total); +switch (xfs_attr_intent_op (attr)) { +case XFS_ATTRI_OP_FLAGS_PPTR_SET : +case XFS_ATTRI_OP_FLAGS_PPTR_REPLACE : +case XFS_ATTRI_OP_FLAGS_SET : +case XFS_ATTRI_OP_FLAGS_REPLACE : + total =xfs_attr_init_set_trans (args, &resv); +break ; +case XFS_ATTRI_OP_FLAGS_PPTR_REMOVE : +case XFS_ATTRI_OP_FLAGS_REMOVE : + total =xfs_attr_init_remove_trans (args, &resv); +break ; + } resv =xlog_recover_resv (&resv); error =xfs_trans_alloc (mp, &resv, total,0 ,XFS_TRANS_RESERVE , &tp);if (error)
fs/xfs/libxfs/xfs_attr.c xfs_attr_calc_size( · line 354
Quoted 3 lines · Darrick J. Wong
fs/xfs/libxfs/xfs_attr.c +2
-0+ tres->tr_logcount =XFS_ATTRSET_LOG_COUNT ; tres->tr_logflags =XFS_TRANS_PERM_LOG_RES ; +return args->total;
Seems like indentation is off for the XFS_TRANS_PERM_LOG_RES assignment?
Also wju does this need to return args->total vs just handling it in the caller?
fs/xfs/libxfs/xfs_attr.c xfs_attr_calc_size( · line 366
Quoted 10 lines
fs/xfs/libxfs/xfs_attr.c +10
-0+/* Initialize transaction reservation for an xattr remove */ +unsigned int +xfs_attr_init_remove_trans ( +struct xfs_da_args *args, +struct xfs_trans_res *tres) +{ +struct xfs_mount *mp = args->dp->i_mount; + + *tres =M_RES (mp)->tr_attrrm; +return XFS_ATTRRM_SPACE_RES (mp);
And do we even need this helper vs open coding it like we do in most transaction allocations?
Quoted 7 lines · Christoph Hellwig
fs/xfs/libxfs/xfs_attr.c xfs_attr_calc_size( · line 354
Quoted 3 lines · Darrick J. Wong
fs/xfs/libxfs/xfs_attr.c +2
-0+ tres->tr_logcount =XFS_ATTRSET_LOG_COUNT ; tres->tr_logflags =XFS_TRANS_PERM_LOG_RES ; +return args->total;Seems like indentation is off for the
XFS_TRANS_PERM_LOG_RESassignment?
Oops. I think I could shorten this to:
/* Initialize transaction reservation for an xattr set/replace/upsert */ inline struct xfs_trans_res
xfs_attr_set_resv(
const struct xfs_da_args *args)
{
struct xfs_mount *mp = args->dp->i_mount;
struct xfs_trans_res ret = {
.tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +
M_RES(mp)->tr_attrsetrt.tr_logres * args->total,
.tr_logcount = XFS_ATTRSET_LOG_COUNT,
.tr_logflags = XFS_TRANS_PERM_LOG_RES,
};
return ret;
}Quoted 2 lines
Also wju does this need to return
args->totalvs just handling it in the caller?
I'm not sure, @total for the remove action used to be in xfs_attr_set prior to the creation of xfs_attr_recover_work.
Quoted 5 lines
Quoted 5 lines
fs/xfs/libxfs/xfs_attr.c +5
-0+/* Initialize transaction reservation for an xattr remove */ +unsigned int +xfs_attr_init_remove_trans ( +struct xfs_da_args *args, +struct xfs_trans_res *tres)
Quoted 8 lines
fs/xfs/libxfs/xfs_attr.c xfs_attr_calc_size( · line 366
Quoted 5 lines
fs/xfs/libxfs/xfs_attr.c +5
-0+{ +struct xfs_mount *mp = args->dp->i_mount; + + *tres =M_RES (mp)->tr_attrrm; +return XFS_ATTRRM_SPACE_RES (mp);And do we even need this helper vs open coding it like we do in most transaction allocations?
Not really.
--D
PATCH v2 1/1 xfs: fix xfs_init_attr_trans not handling explicit operation codes
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
When we were converting the attr code to use an explicit operation code instead of keying off of attr->value being null, we forgot to change the code that initializes the transaction reservation. Split the function into two helpers that handle the !remove and remove cases, then fix both callsites to handle this correctly.
---
v2: remove the xfs_init_attr_remove_trans function, fix indenting
--- fs/xfs/libxfs/xfs_attr.c | 37 +++++++++++++++++-------------------- fs/xfs/libxfs/xfs_attr.h | 3 +-- fs/xfs/xfs_attr_item.c | 17 +++++++++++++++-- 3 files changed, 33 insertions(+), 24 deletions(-)
fs/xfs/libxfs/xfs_attr.c +17 -20
@@ -339,26 +339,20 @@ xfs_attr_calc_size(return nblks; } -/* Initialize transaction reservation for attr operations */ -void -xfs_init_attr_trans ( -struct xfs_da_args *args, -struct xfs_trans_res *tres, -unsigned int *total) +/* Initialize transaction reservation for an xattr set/replace/upsert */ +inline struct xfs_trans_res +xfs_attr_set_resv ( +const struct xfs_da_args *args) { -struct xfs_mount *mp = args->dp->i_mount; +struct xfs_mount *mp = args->dp->i_mount; +struct xfs_trans_res ret = { + .tr_logres =M_RES (mp)->tr_attrsetm.tr_logres + +M_RES (mp)->tr_attrsetrt.tr_logres * args->total, + .tr_logcount =XFS_ATTRSET_LOG_COUNT , + .tr_logflags =XFS_TRANS_PERM_LOG_RES , + }; -if (args->value) { - tres->tr_logres =M_RES (mp)->tr_attrsetm.tr_logres + -M_RES (mp)->tr_attrsetrt.tr_logres * - args->total; - tres->tr_logcount =XFS_ATTRSET_LOG_COUNT ; - tres->tr_logflags =XFS_TRANS_PERM_LOG_RES ; - *total = args->total; - }else { - *tres =M_RES (mp)->tr_attrrm; - *total =XFS_ATTRRM_SPACE_RES (mp); - } +return ret; }/*
@@ -1021,7 +1015,7 @@ xfs_attr_set(struct xfs_trans_res tres;int error, local;int rmt_blks =0 ; -unsigned int total; +unsigned int total =0 ;ASSERT (!args->trans);
@@ -1049,10 +1043,14 @@ xfs_attr_set(if (!local) rmt_blks =xfs_attr3_rmt_blocks (mp, args->attr_filter, args->valuelen); + tres =xfs_attr_set_resv (args); + total = args->total;break ;case XFS_ATTRUPDATE_REMOVE :XFS_STATS_INC (mp, xs_attr_remove); rmt_blks =xfs_attr3_max_rmt_blocks (mp); + tres =M_RES (mp)->tr_attrrm; + total =XFS_ATTRRM_SPACE_RES (mp);break ; }
@@ -1060,7 +1058,6 @@ xfs_attr_set(* Root fork attributes can use reserved data blocks for this * operation if necessary */ -xfs_init_attr_trans (args, &tres, &total); error =xfs_trans_alloc_inode (dp, &tres, total,0 , rsvd, &args->trans);if (error)return error;
fs/xfs/libxfs/xfs_attr.h +1 -2
@@ -565,8 +565,7 @@ bool xfs_attr_check_namespace(unsigned int attr_flags);bool xfs_attr_namecheck (unsigned int attr_flags,const void *name,size_t length);int xfs_attr_calc_size (struct xfs_da_args *args,int *local); -void xfs_init_attr_trans (struct xfs_da_args *args,struct xfs_trans_res *tres, -unsigned int *total); +struct xfs_trans_res xfs_attr_set_resv (const struct xfs_da_args *args);/* * Check to see if the attr should be upgraded from non-existent or shortform to
fs/xfs/xfs_attr_item.c +15 -2
@@ -746,7 +746,7 @@ xfs_attr_recover_work(struct xfs_attri_log_format *attrp;struct xfs_attri_log_nameval *nv = attrip->attri_nameval;int error; -int total; +unsigned int total =0 ;/* * First check the validity of the attr described by the ATTRI. If any
@@ -763,7 +763,20 @@ xfs_attr_recover_work(return PTR_ERR (attr); args = attr->xattri_da_args; -xfs_init_attr_trans (args, &resv, &total); +switch (xfs_attr_intent_op (attr)) { +case XFS_ATTRI_OP_FLAGS_PPTR_SET : +case XFS_ATTRI_OP_FLAGS_PPTR_REPLACE : +case XFS_ATTRI_OP_FLAGS_SET : +case XFS_ATTRI_OP_FLAGS_REPLACE : + resv =xfs_attr_set_resv (args); + total = args->total; +break ; +case XFS_ATTRI_OP_FLAGS_PPTR_REMOVE : +case XFS_ATTRI_OP_FLAGS_REMOVE : + resv =M_RES (mp)->tr_attrrm; + total =XFS_ATTRRM_SPACE_RES (mp); +break ; + } resv =xlog_recover_resv (&resv); error =xfs_trans_alloc (mp, &resv, total,0 ,XFS_TRANS_RESERVE , &tp);if (error)
Looks good: