Merge tag 'irqchip-urgent-3.19' of git://git.infradead.org/users/jcooper/linux into...

[firefly-linux-kernel-4.4.55.git] / fs / jffs2 / readinode.c

diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index 386303dca382e636fa9aab5d547f343e2e5058a1..dddbde4f56f4e32a4c43caff1c4ab231c7106ce6 100644 (file)
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -224,7 +224,7 @@ static int jffs2_add_tn_to_tree(struct jffs2_sb_info *c,
 
        dbg_readinode("insert fragment %#04x-%#04x, ver %u at %08x\n", tn->fn->ofs, fn_end, tn->version, ref_offset(tn->fn->raw));
 
-       /* If a node has zero dsize, we only have to keep if it if it might be the
+       /* If a node has zero dsize, we only have to keep it if it might be the
           node with highest version -- i.e. the one which will end up as f->metadata.
           Note that such nodes won't be REF_UNCHECKED since there are no data to
           check anyway. */