diff --git a/checksum.h b/checksum.h
index ff6812f75..5bf784ad7 100644
--- a/checksum.h
+++ b/checksum.h
@@ -16,7 +16,6 @@ u32 static inline reiser4_crc32c(struct crypto_shash *tfm,
int err;
desc.shash.tfm = tfm;
- desc.shash.flags = 0;
*(u32 *)desc.ctx = crc;
err = crypto_shash_update(&desc.shash, address, length);
diff --git a/flush_queue.c b/flush_queue.c
index e83413ff1..254e22f43 100644
--- a/flush_queue.c
+++ b/flush_queue.c
@@ -398,7 +398,6 @@ int atom_fq_parts_are_clean(txn_atom * atom)
*/
static void end_io_handler(struct bio *bio)
{
- int i;
int nr = 0;
int nr_errors = 0;
flush_queue_t *fq;
@@ -411,7 +410,7 @@ static void end_io_handler(struct bio *bio)
* for synchronization and error counting. */
fq = bio->bi_private;
/* Check all elements of io_vec for correct write completion. */
- bio_for_each_segment_all(bvec, bio, i, iter_all) {
+ bio_for_each_segment_all(bvec, bio, iter_all) {
struct page *pg = bvec->bv_page;
if (bio->bi_status) {
diff --git a/jnode.c b/jnode.c
index 4cce9d1d6..a40527829 100644
--- a/jnode.c
+++ b/jnode.c
@@ -989,9 +989,9 @@ void jrelse_tail(jnode * node/* jnode to release references to */)
assert("nikita-489", atomic_read(&node->d_count) > 0);
atomic_dec(&node->d_count);
/* release reference acquired in jload_gfp() or jinit_new() */
- jput(node);
if (jnode_is_unformatted(node) || jnode_is_znode(node))
LOCK_CNT_DEC(d_refs);
+ jput(node);
}
/* drop reference to node data. When last reference is dropped, data are
diff --git a/wander.c b/wander.c
index df82d27de..d8afe8c99 100644
--- a/wander.c
+++ b/wander.c
@@ -539,11 +539,10 @@ get_more_wandered_blocks(int count, reiser4_block_nr * start, int *len)
*/
static void undo_bio(struct bio *bio)
{
- int i;
struct bio_vec *bvec;
struct bvec_iter_all iter_all;
- bio_for_each_segment_all(bvec, bio, i, iter_all) {
+ bio_for_each_segment_all(bvec, bio, iter_all) {
struct page *pg;
jnode *node;
