-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 03/21/2012 10:03 PM, Liu Bo wrote: > On 03/22/2012 09:11 AM, Jeff Mahoney wrote: >> There is only one caller of clear_extent_bit that checks the >> return value and it only checks if it's negative. Since there are >> no users of the returned bits functionality of clear_extent_bit, >> stop returning it and avoid complicating error handling. >> > > A similar one from Li: > http://www.spinics.net/lists/linux-btrfs/msg15458.html Yep, I saw that one fly by. This one has been part of this patchset for months. - -Jeff >> Signed-off-by: Jeff Mahoney <jeffm@xxxxxxxx> --- >> fs/btrfs/extent_io.c | 12 +++++------- 1 files changed, 5 >> insertions(+), 7 deletions(-) >> >> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index >> 601f23b..a4a7a18 100644 --- a/fs/btrfs/extent_io.c +++ >> b/fs/btrfs/extent_io.c @@ -462,8 +462,7 @@ void >> extent_io_tree_panic(struct extent_io_tree *tree, int err) * * >> the range [start, end] is inclusive. * - * This takes the tree >> lock, and returns < 0 on error, > 0 if any of the - * bits were >> already set, or zero if none of the bits were already set. + * >> This takes the tree lock, and returns 0 on success and < 0 on >> error. */ int clear_extent_bit(struct extent_io_tree *tree, u64 >> start, u64 end, int bits, int wake, int delete, @@ -477,7 +476,6 >> @@ int clear_extent_bit(struct extent_io_tree *tree, u64 start, >> u64 end, struct rb_node *node; u64 last_end; int err; - int set = >> 0; int clear = 0; >> >> if (delete) @@ -562,7 +560,7 @@ hit_next: if (err) goto out; if >> (state->end <= end) { - set |= clear_state_bit(tree, state, >> &bits, wake); + clear_state_bit(tree, state, &bits, wake); if >> (last_end == (u64)-1) goto out; start = last_end + 1; @@ -585,13 >> +583,13 @@ hit_next: if (wake) wake_up(&state->wq); >> >> - set |= clear_state_bit(tree, prealloc, &bits, wake); + >> clear_state_bit(tree, prealloc, &bits, wake); >> >> prealloc = NULL; goto out; } >> >> - set |= clear_state_bit(tree, state, &bits, wake); + >> clear_state_bit(tree, state, &bits, wake); next: if (last_end == >> (u64)-1) goto out; @@ -608,7 +606,7 @@ out: if (prealloc) >> free_extent_state(prealloc); >> >> - return set; + return 0; >> >> search_again: if (start > end) > > - -- Jeff Mahoney SUSE Labs -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJPao+0AAoJEB57S2MheeWyUkQP/2aHj9EnC1o6QffQ/Z0xykJp O5e/qoLaAJ9bbvcn0fsaa2qjXOZTx40m0L+VqAfuzSQ9U4ScJr16GoaLkwXBOSOO P2/L5PX5sMzDZYGlG2WAcHras97adr/kViNgT79jwmscaTqs/QBftTajADbwF8rL 1vI5CRsrxd/iWvNrjTDyMYT8lVZmVhuRLOGtS99SGrRkkKQCk+L6edyPUH9/mduV xhayJjAjVyVwzIk1hCJQ7ybM1975vVY92p0XEh8Oa46FSEa2puTZ+fVQjMEjPtcu J/91jgOy2u/h7m2RlYguPmAKN3U2XIlOpIrAcbiU49ugbe4DUiCPV+77gPUU+Ch5 LCJhIHHZulqlB8KM985r5eyxFSYXVdZjN63zhEeptU9z8XY5wDODLcweeKLBW0E5 AAyjeobBJYWKDauisbjeBCuIuiltNyK95pjRtPjVu3pAlAmaKZgJmXPw/8hglgLD hm/g5e3Zk6LHxFhOb4gBa+5qqQ6XUNcgSk5FOOR6abSHZlJ7LBm2TIbKYlrhsWib RssmxAlRAbY7supvJilHEVnVV/RN4ggFVeQ9nzRN2LV5gJychfTBst5xFRRxHoOX Ob8fqxz32iqyCQBFXkqqAbr4j67ok0DW8bBYCL+O8fQE63ZJeiZ71fphWKh0P4GX /WNlhKTSN1BSIaVlqmvm =iuYq -----END PGP SIGNATURE----- -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
