Re: [PATCH 07/10] udf: replace all adds to little endians variables with le*_add_cpu

Jan Kara
2008-01-31T16:43:06Z

On Wed 30-01-08 22:03:57, marcin.slusarz@gmail.com wrote:
> replace all:
> little_endian_variable = cpu_to_leX(leX_to_cpu(little_endian_variable) +
> expression_in_cpu_byteorder);
> with:
> leX_add_cpu(&little_endian_variable, expression_in_cpu_byteorder);
> sparse didn't generate any new warning with this patch
>
> Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com
> Cc: Jan Kara <jack@suse.cz>
Acked-by: Jan Kara <jack@suse.cz>

Honza
> ---
> fs/udf/balloc.c | 13 ++++---------
> fs/udf/ialloc.c | 12 ++++--------
> fs/udf/inode.c | 16 ++++------------
> 3 files changed, 12 insertions(+), 29 deletions(-)
>
> diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
> index d721a1a..a95fcfe 100644
> --- a/fs/udf/balloc.c
> +++ b/fs/udf/balloc.c
> @@ -149,8 +149,7 @@ static bool udf_add_free_space(struct udf_sb_info *sbi,
> return false;
>
> lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data;
> - lvid->freeSpaceTable[partition] = cpu_to_le32(le32_to_cpu(
> - lvid->freeSpaceTable[partition]) + cnt);
> + le32_add_cpu(&lvid->freeSpaceTable[partition], cnt);
> return true;
> }
>
> @@ -589,10 +588,8 @@ static void udf_table_free_blocks(struct super_block *sb,
> sptr = oepos.bh->b_data + epos.offset;
> aed = (struct allocExtDesc *)
> oepos.bh->b_data;
> - aed->lengthAllocDescs =
> - cpu_to_le32(le32_to_cpu(
> - aed->lengthAllocDescs) +
> - adsize);
> + le32_add_cpu(&aed->lengthAllocDescs,
> + adsize);
> } else {
> sptr = iinfo->i_ext.i_data +
> epos.offset;
> @@ -645,9 +642,7 @@ static void udf_table_free_blocks(struct super_block *sb,
> mark_inode_dirty(table);
> } else {
> aed = (struct allocExtDesc *)epos.bh->b_data;
> - aed->lengthAllocDescs =
> - cpu_to_le32(le32_to_cpu(
> - aed->lengthAllocDescs) + adsize);
> + le32_add_cpu(&aed->lengthAllocDescs, adsize);
> udf_update_tag(epos.bh->b_data, epos.offset);
> mark_buffer_dirty(epos.bh);
> }
> diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c
> index 8436031..93b40cc 100644
> --- a/fs/udf/ialloc.c
> +++ b/fs/udf/ialloc.c
> @@ -47,11 +47,9 @@ void udf_free_inode(struct inode *inode)
> struct logicalVolIntegrityDescImpUse *lvidiu =
> udf_sb_lvidiu(sbi);
> if (S_ISDIR(inode->i_mode))
> - lvidiu->numDirs =
> - cpu_to_le32(le32_to_cpu(lvidiu->numDirs) - 1);
> + le32_add_cpu(&lvidiu->numDirs, -1);
> else
> - lvidiu->numFiles =
> - cpu_to_le32(le32_to_cpu(lvidiu->numFiles) - 1);
> + le32_add_cpu(&lvidiu->numFiles, -1);
>
> mark_buffer_dirty(sbi->s_lvid_bh);
> }
> @@ -105,11 +103,9 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
> lvhd = (struct logicalVolHeaderDesc *)
> (lvid->logicalVolContentsUse);
> if (S_ISDIR(mode))
> - lvidiu->numDirs =
> - cpu_to_le32(le32_to_cpu(lvidiu->numDirs) + 1);
> + le32_add_cpu(&lvidiu->numDirs, 1);
> else
> - lvidiu->numFiles =
> - cpu_to_le32(le32_to_cpu(lvidiu->numFiles) + 1);
> + le32_add_cpu(&lvidiu->numFiles, 1);
> iinfo->i_unique = uniqueID = le64_to_cpu(lvhd->uniqueID);
> if (!(++uniqueID & 0x00000000FFFFFFFFUL))
> uniqueID += 16;
> diff --git a/fs/udf/inode.c b/fs/udf/inode.c
> index 3483274..68db2ea 100644
> --- a/fs/udf/inode.c
> +++ b/fs/udf/inode.c
> @@ -1778,9 +1778,7 @@ int8_t udf_add_aext(struct inode *inode, struct extent_position *epos,
>
> if (epos->bh) {
> aed = (struct allocExtDesc *)epos->bh->b_data;
> - aed->lengthAllocDescs =
> - cpu_to_le32(le32_to_cpu(
> - aed->lengthAllocDescs) + adsize);
> + le32_add_cpu(&aed->lengthAllocDescs, adsize);
> } else {
> iinfo->i_lenAlloc += adsize;
> mark_inode_dirty(inode);
> @@ -1830,9 +1828,7 @@ int8_t udf_add_aext(struct inode *inode, struct extent_position *epos,
> mark_inode_dirty(inode);
> } else {
> aed = (struct allocExtDesc *)epos->bh->b_data;
> - aed->lengthAllocDescs =
> - cpu_to_le32(le32_to_cpu(aed->lengthAllocDescs) +
> - adsize);
> + le32_add_cpu(&aed->lengthAllocDescs, adsize);
> if (!UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT) ||
> UDF_SB(inode->i_sb)->s_udfrev >= 0x0201)
> udf_update_tag(epos->bh->b_data,
> @@ -2046,9 +2042,7 @@ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos,
> mark_inode_dirty(inode);
> } else {
> aed = (struct allocExtDesc *)oepos.bh->b_data;
> - aed->lengthAllocDescs =
> - cpu_to_le32(le32_to_cpu(aed->lengthAllocDescs) -
> - (2 * adsize));
> + le32_add_cpu(&aed->lengthAllocDescs, -(2 * adsize));
> if (!UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT) ||
> UDF_SB(inode->i_sb)->s_udfrev >= 0x0201)
> udf_update_tag(oepos.bh->b_data,
> @@ -2065,9 +2059,7 @@ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos,
> mark_inode_dirty(inode);
> } else {
> aed = (struct allocExtDesc *)oepos.bh->b_data;
> - aed->lengthAllocDescs =
> - cpu_to_le32(le32_to_cpu(aed->lengthAllocDescs) -
> - adsize);
> + le32_add_cpu(&aed->lengthAllocDescs, -adsize);
> if (!UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT) ||
> UDF_SB(inode->i_sb)->s_udfrev >= 0x0201)
> udf_update_tag(oepos.bh->b_data,
> --
> 1.5.3.7
>
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR