Merge remote-tracking branch 'origin/next' into next

This commit is contained in:
Yehuda Sadeh 2012-11-22 14:59:25 -08:00
commit ab8327fec0

View File

@ -1754,7 +1754,7 @@ CInode* Server::prepare_new_inode(MDRequest *mdr, CDir *dir, inodeno_t useino, u
in->inode.gid = diri->inode.gid;
if (S_ISDIR(mode)) {
dout(10) << " new dir also sticky" << dendl;
mode |= S_ISGID;
in->inode.mode |= S_ISGID;
}
} else
in->inode.gid = mdr->client_request->get_caller_gid();