diff for duplicates of <20071230190619.GA13757@joi> diff --git a/a/1.txt b/N1/1.txt index 01c7a2c..d1b0bf0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -41,7 +41,8 @@ index a8ba7e8..89f320f 100644 jbd_unlock_bh_state(bitmap_bh); spin_lock(sb_bgl_lock(sbi, block_group)); -- desc->bg_free_blocks_count - cpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) + +- desc->bg_free_blocks_count = +- cpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) + - group_freed); + le16_add_cpu(&desc->bg_free_blocks_count, group_freed); spin_unlock(sb_bgl_lock(sbi, block_group)); @@ -51,7 +52,8 @@ index a8ba7e8..89f320f 100644 ret_block, goal_hits, goal_attempts); spin_lock(sb_bgl_lock(sbi, group_no)); -- gdp->bg_free_blocks_count - cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num); +- gdp->bg_free_blocks_count = +- cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num); + le16_add_cpu(&gdp->bg_free_blocks_count, -num); spin_unlock(sb_bgl_lock(sbi, group_no)); percpu_counter_sub(&sbi->s_freeblocks_counter, num); @@ -78,10 +80,12 @@ index 1bc8cd8..3b6b9da 100644 err = ext3_journal_get_write_access(handle, bh2); if (err) goto fail; spin_lock(sb_bgl_lock(sbi, group)); -- gdp->bg_free_inodes_count - cpu_to_le16(le16_to_cpu(gdp->bg_free_inodes_count) - 1); +- gdp->bg_free_inodes_count = +- cpu_to_le16(le16_to_cpu(gdp->bg_free_inodes_count) - 1); + le16_add_cpu(&gdp->bg_free_inodes_count, -1); if (S_ISDIR(mode)) { -- gdp->bg_used_dirs_count - cpu_to_le16(le16_to_cpu(gdp->bg_used_dirs_count) + 1); +- gdp->bg_used_dirs_count = +- cpu_to_le16(le16_to_cpu(gdp->bg_used_dirs_count) + 1); + le16_add_cpu(&gdp->bg_used_dirs_count, 1); } spin_unlock(sb_bgl_lock(sbi, group)); @@ -94,7 +98,8 @@ index 44de145..5b402a7 100644 EXT3_SB(sb)->s_gdb_count++; kfree(o_group_desc); -- es->s_reserved_gdt_blocks - cpu_to_le16(le16_to_cpu(es->s_reserved_gdt_blocks) - 1); +- es->s_reserved_gdt_blocks = +- cpu_to_le16(le16_to_cpu(es->s_reserved_gdt_blocks) - 1); + le16_add_cpu(&es->s_reserved_gdt_blocks, -1); ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh); diff --git a/a/content_digest b/N1/content_digest index f211b21..2046feb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Marcin Slusarz <marcin.slusarz@gmail.com>\0" "Subject\0[RFC][PATCH] byteorder: introduce le32_add_cpu & friends to core\0" - "Date\0Sun, 30 Dec 2007 19:06:34 +0000\0" + "Date\0Sun, 30 Dec 2007 20:06:34 +0100\0" "To\0LKML <linux-kernel@vger.kernel.org>\0" "Cc\0kernel-janitors <kernel-janitors@vger.kernel.org>\0" "\00:1\0" @@ -48,7 +48,8 @@ " \tjbd_unlock_bh_state(bitmap_bh);\n" " \n" " \tspin_lock(sb_bgl_lock(sbi, block_group));\n" - "-\tdesc->bg_free_blocks_count -\t\tcpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) +\n" + "-\tdesc->bg_free_blocks_count =\n" + "-\t\tcpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) +\n" "-\t\t\tgroup_freed);\n" "+\tle16_add_cpu(&desc->bg_free_blocks_count, group_freed);\n" " \tspin_unlock(sb_bgl_lock(sbi, block_group));\n" @@ -58,7 +59,8 @@ " \t\t\tret_block, goal_hits, goal_attempts);\n" " \n" " \tspin_lock(sb_bgl_lock(sbi, group_no));\n" - "-\tgdp->bg_free_blocks_count -\t\t\tcpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num);\n" + "-\tgdp->bg_free_blocks_count =\n" + "-\t\t\tcpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num);\n" "+\tle16_add_cpu(&gdp->bg_free_blocks_count, -num);\n" " \tspin_unlock(sb_bgl_lock(sbi, group_no));\n" " \tpercpu_counter_sub(&sbi->s_freeblocks_counter, num);\n" @@ -85,10 +87,12 @@ " \terr = ext3_journal_get_write_access(handle, bh2);\n" " \tif (err) goto fail;\n" " \tspin_lock(sb_bgl_lock(sbi, group));\n" - "-\tgdp->bg_free_inodes_count -\t\tcpu_to_le16(le16_to_cpu(gdp->bg_free_inodes_count) - 1);\n" + "-\tgdp->bg_free_inodes_count =\n" + "-\t\tcpu_to_le16(le16_to_cpu(gdp->bg_free_inodes_count) - 1);\n" "+\tle16_add_cpu(&gdp->bg_free_inodes_count, -1);\n" " \tif (S_ISDIR(mode)) {\n" - "-\t\tgdp->bg_used_dirs_count -\t\t\tcpu_to_le16(le16_to_cpu(gdp->bg_used_dirs_count) + 1);\n" + "-\t\tgdp->bg_used_dirs_count =\n" + "-\t\t\tcpu_to_le16(le16_to_cpu(gdp->bg_used_dirs_count) + 1);\n" "+\t\tle16_add_cpu(&gdp->bg_used_dirs_count, 1);\n" " \t}\n" " \tspin_unlock(sb_bgl_lock(sbi, group));\n" @@ -101,7 +105,8 @@ " \tEXT3_SB(sb)->s_gdb_count++;\n" " \tkfree(o_group_desc);\n" " \n" - "-\tes->s_reserved_gdt_blocks -\t\tcpu_to_le16(le16_to_cpu(es->s_reserved_gdt_blocks) - 1);\n" + "-\tes->s_reserved_gdt_blocks =\n" + "-\t\tcpu_to_le16(le16_to_cpu(es->s_reserved_gdt_blocks) - 1);\n" "+\tle16_add_cpu(&es->s_reserved_gdt_blocks, -1);\n" " \text3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);\n" " \n" @@ -333,4 +338,4 @@ "-- \n" 1.5.3.7 -e55bf4efd81ed56ed2218d80a6284ac6558959f38b37759358b46b802985441b +deb4a8157caf9cab901faf1153a5a500813b14a62badb16b5d72c6660f17e718
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.