diff options
| author | marcin.slusarz@gmail.com <marcin.slusarz@gmail.com> | 2008-01-30 22:03:55 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2008-04-17 14:22:28 +0200 |
| commit | 9de90b76eb96e7cdeac8b8dbe7d3db948b070f4d (patch) | |
| tree | ea118b0f7a6c6f9104574011fb4f57fce8a8068a /fs/udf | |
| parent | c8ed837d371c24b678182a30e9f0b1f61dee212c (diff) | |
| download | lwn-9de90b76eb96e7cdeac8b8dbe7d3db948b070f4d.tar.gz lwn-9de90b76eb96e7cdeac8b8dbe7d3db948b070f4d.zip | |
udf: simple cleanup of truncate.c
- 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>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | 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 6111d97902d7..cde328f16775 100644 --- a/fs/udf/truncate.c +++ b/fs/udf/truncate.c @@ -223,34 +223,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); @@ -271,28 +266,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) { |