Commit 469fb36a authored by J. R. Okajima's avatar J. R. Okajima
Browse files

Merge branch 'aufs5.x-rcN/00base' into aufs5.x-rcN/01modular

parents ea5c3423 ba1baefc
...@@ -643,7 +643,7 @@ void au_pin_hdir_release(struct au_pin *p) ...@@ -643,7 +643,7 @@ void au_pin_hdir_release(struct au_pin *p)
{ {
if (p->hdir) { if (p->hdir) {
au_pin_hdir_set_owner(p, p->task); 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_);
} }
} }
......
...@@ -192,7 +192,7 @@ static void au_wkq_lockdep_post(struct au_wkinfo *wkinfo) ...@@ -192,7 +192,7 @@ static void au_wkq_lockdep_post(struct au_wkinfo *wkinfo)
if (!hl) if (!hl)
return; return;
while ((p = *hl++)) /* assignment */ while ((p = *hl++)) /* assignment */
rwsem_release(p->instance, 0, /*p->acquire_ip*/_RET_IP_); rwsem_release(p->instance, /*p->acquire_ip*/_RET_IP_);
} }
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment