Merge branch 'aufs5.0/30stdalone' into aufs5.1/30stdalone

fs/aufs/dynop.c

@@ -40,8 +40,8 @@ static struct au_dykey *dy_gfind_get(struct hlist_bl_head *hbl,
 	hlist_bl_lock(hbl);
 	hlist_bl_for_each_entry(tmp, pos, hbl, dk_hnode)
 		if (tmp->dk_op.dy_hop == h_op) {
-			key = tmp;
-			kref_get(&key->dk_kref);
+			if (kref_get_unless_zero(&tmp->dk_kref))
+				key = tmp;
 			break;
 		}
 	hlist_bl_unlock(hbl);
@@ -95,8 +95,8 @@ static struct au_dykey *dy_gadd(struct hlist_bl_head *hbl, struct au_dykey *key)
 	hlist_bl_lock(hbl);
 	hlist_bl_for_each_entry(tmp, pos, hbl, dk_hnode)
 		if (tmp->dk_op.dy_hop == h_op) {
-			kref_get(&tmp->dk_kref);
-			found = tmp;
+			if (kref_get_unless_zero(&tmp->dk_kref))
+				found = tmp;
 			break;
 		}
 	if (!found)
@@ -114,7 +114,7 @@ static void dy_free_rcu(struct rcu_head *rcu)
 
 	key = container_of(rcu, struct au_dykey, dk_rcu);
 	DyPrSym(key);
-	au_kfree_rcu(key);
+	kfree(key);
 }
 
 static void dy_free(struct kref *kref)

fs/aufs/procfs.c

@@ -61,8 +61,8 @@ static int au_procfs_plm_write_si(struct file *file, unsigned long id)
 	hlist_bl_lock(&au_sbilist);
 	hlist_bl_for_each_entry(sbinfo, pos, &au_sbilist, si_list)
 		if (id == sysaufs_si_id(sbinfo)) {
-			kobject_get(&sbinfo->si_kobj);
-			sb = sbinfo->si_sb;
+			if (kobject_get_unless_zero(&sbinfo->si_kobj))
+				sb = sbinfo->si_sb;
 			break;
 		}
 	hlist_bl_unlock(&au_sbilist);