Re: [PATCH 05/10] udf: simple cleanup of truncate.c

Jan Kara
2008-01-31T13:01:42Z

On Wed 30-01-08 22:03:55, marcin.slusarz@gmail.com wrote:
> - remove one indentation level by little code reorganization
> - convert "if (smth) BUG();" to "BUG_ON(smth);"
>
> 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/truncate.c | 76 +++++++++++++++++++++++-----------------------------
> 1 files changed, 34 insertions(+), 42 deletions(-)
>
> diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c
> index fe61be1..f64f827 100644
> --- a/fs/udf/truncate.c
> +++ b/fs/udf/truncate.c
> @@ -224,34 +224,29 @@ void udf_truncate_extents(struct inode *inode)
> if (indirect_ext_len) {
> /* We managed to free all extents in the
> * indirect extent - free it too */
> - if (!epos.bh)
> - BUG();
> + BUG_ON(!epos.bh);
> udf_free_blocks(sb, inode, epos.block,
> 0, indirect_ext_len);
> + } else if (!epos.bh) {
> + iinfo->i_lenAlloc = lenalloc;
> + mark_inode_dirty(inode);
> } else {
> - if (!epos.bh) {
> - iinfo->i_lenAlloc =
> - lenalloc;
> - mark_inode_dirty(inode);
> - } else {
> - struct allocExtDesc *aed =
> - (struct allocExtDesc *)
> - (epos.bh->b_data);
> - int len =
> - sizeof(struct allocExtDesc);
> + struct allocExtDesc *aed =
> + (struct allocExtDesc *)
> + (epos.bh->b_data);
> + int len = sizeof(struct allocExtDesc);
>
> - aed->lengthAllocDescs =
> - cpu_to_le32(lenalloc);
> - if (!UDF_QUERY_FLAG(sb,
> - UDF_FLAG_STRICT) ||
> - sbi->s_udfrev >= 0x0201)
> - len += lenalloc;
> + aed->lengthAllocDescs =
> + cpu_to_le32(lenalloc);
> + if (!UDF_QUERY_FLAG(sb,
> + UDF_FLAG_STRICT) ||
> + sbi->s_udfrev >= 0x0201)
> + len += lenalloc;
>
> - udf_update_tag(epos.bh->b_data,
> - len);
> - mark_buffer_dirty_inode(
> - epos.bh, inode);
> - }
> + udf_update_tag(epos.bh->b_data,
> + len);
> + mark_buffer_dirty_inode(
> + epos.bh, inode);
> }
> brelse(epos.bh);
> epos.offset = sizeof(struct allocExtDesc);
> @@ -272,28 +267,25 @@ void udf_truncate_extents(struct inode *inode)
> }
>
> if (indirect_ext_len) {
> - if (!epos.bh)
> - BUG();
> + BUG_ON(!epos.bh);
> udf_free_blocks(sb, inode, epos.block, 0,
> indirect_ext_len);
> + } else if (!epos.bh) {
> + iinfo->i_lenAlloc = lenalloc;
> + mark_inode_dirty(inode);
> } else {
> - if (!epos.bh) {
> - iinfo->i_lenAlloc = lenalloc;
> - mark_inode_dirty(inode);
> - } else {
> - struct allocExtDesc *aed =
> - (struct allocExtDesc *)(epos.bh->b_data);
> - aed->lengthAllocDescs = cpu_to_le32(lenalloc);
> - if (!UDF_QUERY_FLAG(sb, UDF_FLAG_STRICT) ||
> - sbi->s_udfrev >= 0x0201)
> - udf_update_tag(epos.bh->b_data,
> - lenalloc +
> - sizeof(struct allocExtDesc));
> - else
> - udf_update_tag(epos.bh->b_data,
> - sizeof(struct allocExtDesc));
> - mark_buffer_dirty_inode(epos.bh, inode);
> - }
> + struct allocExtDesc *aed =
> + (struct allocExtDesc *)(epos.bh->b_data);
> + aed->lengthAllocDescs = cpu_to_le32(lenalloc);
> + if (!UDF_QUERY_FLAG(sb, UDF_FLAG_STRICT) ||
> + sbi->s_udfrev >= 0x0201)
> + udf_update_tag(epos.bh->b_data,
> + lenalloc +
> + sizeof(struct allocExtDesc));
> + else
> + udf_update_tag(epos.bh->b_data,
> + sizeof(struct allocExtDesc));
> + mark_buffer_dirty_inode(epos.bh, inode);
> }
> } else if (inode->i_size) {
> if (byte_offset) {
> --
> 1.5.3.7
>
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR