summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2012-11-22 14:59:25 -0800
committerYehuda Sadeh <yehuda@inktank.com>2012-11-22 14:59:25 -0800
commitab8327fec05c9c6b96cae537ccf7fd09a9fca18b (patch)
treea2ec96584d0fc09088c06c54d3d0e1c76949ba54
parent3110e5ca4237a5542e7e06067d2a9b3c28da05c7 (diff)
parent1c715a11f70788d987c16aa67ce2b6f32c04a673 (diff)
downloadceph-ab8327fec05c9c6b96cae537ccf7fd09a9fca18b.tar.gz
Merge remote-tracking branch 'origin/next' into next
-rw-r--r--src/mds/Server.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 4642a1346ff..b0fd9ec0c15 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -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();