Merge pull request #6941 from jcsp/wip-14029

mds: fix setvxattr (broken in a536d114)
This commit is contained in:
Yan, Zheng 2015-12-16 19:55:40 +08:00
commit db8bf2dcea

View File

@ -4157,6 +4157,7 @@ void Server::handle_set_vxattr(MDRequestRef& mdr, CInode *cur,
return;
}
xlocks.insert(&cur->filelock);
if (!mds->locker->acquire_locks(mdr, rdlocks, wrlocks, xlocks))
return;
@ -4166,7 +4167,6 @@ void Server::handle_set_vxattr(MDRequestRef& mdr, CInode *cur,
}
}
xlocks.insert(&cur->filelock);
pi = cur->project_inode();
int64_t old_pool = pi->layout.fl_pg_pool;
pi->add_old_pool(old_pool);