Merge branch 'aufs5.x-rcN/01modular' into aufs5.x-rcN/30stdalone

fs/aufs/i_op.c

@@ -656,7 +656,7 @@ void au_pin_hdir_release(struct au_pin *p)
 {
 	if (p->hdir) {
 		au_pin_hdir_set_owner(p, p->task);
-		rwsem_release(&p->hdir->hi_inode->i_rwsem.dep_map, 1, _RET_IP_);
+		rwsem_release(&p->hdir->hi_inode->i_rwsem.dep_map, _RET_IP_);
 	}
 }
 

fs/aufs/wkq.c

@@ -205,7 +205,7 @@ static void au_wkq_lockdep_post(struct au_wkinfo *wkinfo)
 	if (!hl)
 		return;
 	while ((p = *hl++)) /* assignment */
-		rwsem_release(p->instance, 0, /*p->acquire_ip*/_RET_IP_);
+		rwsem_release(p->instance, /*p->acquire_ip*/_RET_IP_);
 }
 #endif