uclient: Attempt preemptive cap dropping on mknod.

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 89ba2d35797aaa0c94687a69fc995c2ab83f448b..3d9ad338eee3f680343fbc1273ca582e733270e6 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -5147,6 +5147,10 @@ int Client::_mknod(Inode *dir, const char *name, mode_t mode, dev_t rdev, int ui
 { 
   dout(3) << "_mknod(" << dir->ino << " " << name << ", 0" << oct << mode << dec << ", " << rdev << ")" << dendl;
 
+  Dentry *dn;
+  int res = get_or_create(dir, name, &dn);
+  if (res<0)
+    return res;
   MetaRequest *req = new MetaRequest(CEPH_MDS_OP_MKNOD);
   filepath path;
   dir->make_path(path);
@@ -5154,8 +5158,10 @@ int Client::_mknod(Inode *dir, const char *name, mode_t mode, dev_t rdev, int ui
   req->set_filepath(path); 
   req->head.args.mknod.mode = mode;
   req->head.args.mknod.rdev = rdev;
-
-  int res = make_request(req, uid, gid);
+  req->dentry_drop = CEPH_CAP_FILE_SHARED;
+  req->dentry_unless = CEPH_CAP_FILE_EXCL;
+  req->dentry = dn;
+  res = make_request(req, uid, gid);
 
   trim_cache();