diff --git a/[refs] b/[refs] index 66f956cd00b9..ba7e9edbbf96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba2f48f70efcf4d82deafb2be327ed64b1f043a5 +refs/heads/master: 1a9476a77083354005750c9df45ba9d71ad12c8c diff --git a/trunk/fs/ubifs/gc.c b/trunk/fs/ubifs/gc.c index dafef3d195d3..4fc31ca0e3b1 100644 --- a/trunk/fs/ubifs/gc.c +++ b/trunk/fs/ubifs/gc.c @@ -125,6 +125,9 @@ int data_nodes_cmp(void *priv, struct list_head *a, struct list_head *b) struct ubifs_scan_node *sa, *sb; cond_resched(); + if (a == b) + return 0; + sa = list_entry(a, struct ubifs_scan_node, list); sb = list_entry(b, struct ubifs_scan_node, list); @@ -165,6 +168,9 @@ int nondata_nodes_cmp(void *priv, struct list_head *a, struct list_head *b) struct ubifs_scan_node *sa, *sb; cond_resched(); + if (a == b) + return 0; + sa = list_entry(a, struct ubifs_scan_node, list); sb = list_entry(b, struct ubifs_scan_node, list);