move mds op defs into ceph_fs

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@2099 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/client/Client.cc b/trunk/ceph/client/Client.cc
index c259b0208e3215b4400d3cc2cba3f171b9f29566..36bbab038050835c081016d7310634a87e2073b2 100644 (file)
--- a/trunk/ceph/client/Client.cc
+++ b/trunk/ceph/client/Client.cc
@@ -615,10 +615,10 @@ MClientReply *Client::make_request(MClientRequest *req,
   
   bool nojournal = false;
   int op = req->get_op();
-  if (op == MDS_OP_STAT ||
-      op == MDS_OP_LSTAT ||
-      op == MDS_OP_READDIR ||
-      op == MDS_OP_OPEN)
+  if (op == CEPH_MDS_OP_STAT ||
+      op == CEPH_MDS_OP_LSTAT ||
+      op == CEPH_MDS_OP_READDIR ||
+      op == CEPH_MDS_OP_OPEN)
     nojournal = true;
 
 
@@ -743,11 +743,11 @@ MClientReply *Client::make_request(MClientRequest *req,
       client_logger->inc("lwnum");
     }
     
-    if (op == MDS_OP_STAT) {
+    if (op == CEPH_MDS_OP_STAT) {
       client_logger->finc("lstatsum",(double)lat);
       client_logger->inc("lstatnum");
     }
-    else if (op == MDS_OP_READDIR) {
+    else if (op == CEPH_MDS_OP_READDIR) {
       client_logger->finc("ldirsum",(double)lat);
       client_logger->inc("ldirnum");
     }
@@ -1605,7 +1605,7 @@ int Client::_link(const char *existing, const char *newname)
   // main path arg is new link name
   // sarg is target (existing file)
 
-  MClientRequest *req = new MClientRequest(MDS_OP_LINK, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_LINK, messenger->get_myinst());
   req->set_path(newname);
   req->set_path2(existing);
   
@@ -1640,7 +1640,7 @@ int Client::unlink(const char *relpath)
 int Client::_unlink(const char *path)
 {
 
-  MClientRequest *req = new MClientRequest(MDS_OP_UNLINK, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_UNLINK, messenger->get_myinst());
   req->set_path(path);
  
   // FIXME where does FUSE maintain user information
@@ -1684,7 +1684,7 @@ int Client::rename(const char *relfrom, const char *relto)
 
 int Client::_rename(const char *from, const char *to)
 {
-  MClientRequest *req = new MClientRequest(MDS_OP_RENAME, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_RENAME, messenger->get_myinst());
   req->set_path(from);
   req->set_path2(to);
  
@@ -1732,7 +1732,7 @@ int Client::mkdir(const char *relpath, mode_t mode)
 
 int Client::_mkdir(const char *path, mode_t mode)
 {
-  MClientRequest *req = new MClientRequest(MDS_OP_MKDIR, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_MKDIR, messenger->get_myinst());
   req->set_path(path);
   req->head.args.mkdir.mode = mode;
  
@@ -1767,7 +1767,7 @@ int Client::rmdir(const char *relpath)
 
 int Client::_rmdir(const char *path)
 {
-  MClientRequest *req = new MClientRequest(MDS_OP_RMDIR, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_RMDIR, messenger->get_myinst());
   req->set_path(path);
  
   // FIXME where does FUSE maintain user information
@@ -1812,7 +1812,7 @@ int Client::symlink(const char *target, const char *rellink)
 
 int Client::_symlink(const char *target, const char *link)
 {
-  MClientRequest *req = new MClientRequest(MDS_OP_SYMLINK, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_SYMLINK, messenger->get_myinst());
   req->set_path(link);
   req->set_path2(target);
  
@@ -1899,7 +1899,7 @@ int Client::_do_lstat(const char *path, int mask, Inode **in)
     //req->set_caller_uid(fc->uid);
     //req->set_caller_gid(fc->gid);
     
-    req = new MClientRequest(MDS_OP_LSTAT, messenger->get_myinst());
+    req = new MClientRequest(CEPH_MDS_OP_LSTAT, messenger->get_myinst());
     req->head.args.stat.mask = mask;
     req->set_filepath(fpath);
 
@@ -2034,7 +2034,7 @@ int Client::chmod(const char *relpath, mode_t mode)
 int Client::_chmod(const char *path, mode_t mode) 
 {
   dout(3) << "_chmod(" << path << ", 0" << oct << mode << dec << ")" << dendl;
-  MClientRequest *req = new MClientRequest(MDS_OP_CHMOD, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_CHMOD, messenger->get_myinst());
   req->set_path(path); 
   req->head.args.chmod.mode = mode;
 
@@ -2068,7 +2068,7 @@ int Client::chown(const char *relpath, uid_t uid, gid_t gid)
 int Client::_chown(const char *path, uid_t uid, gid_t gid)
 {
   dout(3) << "_chown(" << path << ", " << uid << ", " << gid << ")" << dendl;
-  MClientRequest *req = new MClientRequest(MDS_OP_CHOWN, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_CHOWN, messenger->get_myinst());
   req->set_path(path); 
   req->head.args.chown.uid = uid;
   req->head.args.chown.gid = gid;
@@ -2106,7 +2106,7 @@ int Client::utime(const char *relpath, struct utimbuf *buf)
 int Client::_utimes(const char *path, utime_t mtime, utime_t atime)
 {
   dout(3) << "_utimes(" << path << ", " << mtime << ", " << atime << ")" << dendl;
-  MClientRequest *req = new MClientRequest(MDS_OP_UTIME, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_UTIME, messenger->get_myinst());
   req->set_path(path); 
   req->head.args.utime.mtime = mtime.tv_ref();
   req->head.args.utime.atime = atime.tv_ref();
@@ -2144,7 +2144,7 @@ int Client::_mknod(const char *path, mode_t mode, dev_t rdev)
 { 
   dout(3) << "_mknod(" << path << ", 0" << oct << mode << dec << ", " << rdev << ")" << dendl;
 
-  MClientRequest *req = new MClientRequest(MDS_OP_MKNOD, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_MKNOD, messenger->get_myinst());
   req->set_path(path); 
   req->head.args.mknod.mode = mode;
   req->head.args.mknod.rdev = rdev;
@@ -2301,7 +2301,7 @@ int Client::_readdir_get_frag(DirResult *dirp)
   
   dout(10) << "_readdir_get_frag " << dirp << " on " << dirp->path << " fg " << fg << dendl;
 
-  MClientRequest *req = new MClientRequest(MDS_OP_READDIR, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_READDIR, messenger->get_myinst());
   req->set_filepath(dirp->path); 
   req->head.args.readdir.frag = fg;
   
@@ -2528,7 +2528,7 @@ int Client::open(const char *relpath, int flags, mode_t mode)
 int Client::_open(const char *path, int flags, mode_t mode, Fh **fhp) 
 {
   // go
-  MClientRequest *req = new MClientRequest(MDS_OP_OPEN, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_OPEN, messenger->get_myinst());
   req->set_path(path); 
   req->head.args.open.flags = flags;
   req->head.args.open.mode = mode;
@@ -3085,7 +3085,7 @@ int Client::truncate(const char *relpath, off_t length)
 
 int Client::_truncate(const char *file, off_t length) 
 {
-  MClientRequest *req = new MClientRequest(MDS_OP_TRUNCATE, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_TRUNCATE, messenger->get_myinst());
   req->set_path(file); 
   req->head.args.truncate.length = length;
 
@@ -3116,7 +3116,7 @@ int Client::ftruncate(int fd, off_t length)
 
 int Client::_ftruncate(Fh *fh, off_t length) 
 {
-  MClientRequest *req = new MClientRequest(MDS_OP_TRUNCATE, messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_TRUNCATE, messenger->get_myinst());
   req->head.args.truncate.ino = fh->inode->inode.ino;
   req->head.args.truncate.length = length;
 

diff --git a/trunk/ceph/client/SyntheticClient.cc b/trunk/ceph/client/SyntheticClient.cc
index 78b00d4b581d1ff998ab77787c37b5bcd78b698a..84c21c3fc243abeeb311e24614082e27cdea6b4e 100644 (file)
--- a/trunk/ceph/client/SyntheticClient.cc
+++ b/trunk/ceph/client/SyntheticClient.cc
@@ -808,27 +808,27 @@ bool roll_die(float p)
 void SyntheticClient::init_op_dist()
 {
   op_dist.clear();
-  op_dist.add( MDS_OP_STAT, g_conf.fakeclient_op_stat );
-  op_dist.add( MDS_OP_UTIME, g_conf.fakeclient_op_utime );
-  op_dist.add( MDS_OP_CHMOD, g_conf.fakeclient_op_chmod );
-  op_dist.add( MDS_OP_CHOWN, g_conf.fakeclient_op_chown );
-
-  op_dist.add( MDS_OP_READDIR, g_conf.fakeclient_op_readdir );
-  op_dist.add( MDS_OP_MKNOD, g_conf.fakeclient_op_mknod );
-  op_dist.add( MDS_OP_LINK, g_conf.fakeclient_op_link );
-  op_dist.add( MDS_OP_UNLINK, g_conf.fakeclient_op_unlink );
-  op_dist.add( MDS_OP_RENAME, g_conf.fakeclient_op_rename );
-
-  op_dist.add( MDS_OP_MKDIR, g_conf.fakeclient_op_mkdir );
-  op_dist.add( MDS_OP_RMDIR, g_conf.fakeclient_op_rmdir );
-  op_dist.add( MDS_OP_SYMLINK, g_conf.fakeclient_op_symlink );
-
-  op_dist.add( MDS_OP_OPEN, g_conf.fakeclient_op_openrd );
-  //op_dist.add( MDS_OP_READ, g_conf.fakeclient_op_read );
-  //op_dist.add( MDS_OP_WRITE, g_conf.fakeclient_op_write );
-  op_dist.add( MDS_OP_TRUNCATE, g_conf.fakeclient_op_truncate );
-  op_dist.add( MDS_OP_FSYNC, g_conf.fakeclient_op_fsync );
-  op_dist.add( MDS_OP_RELEASE, g_conf.fakeclient_op_close );  // actually, close()
+  op_dist.add( CEPH_MDS_OP_STAT, g_conf.fakeclient_op_stat );
+  op_dist.add( CEPH_MDS_OP_UTIME, g_conf.fakeclient_op_utime );
+  op_dist.add( CEPH_MDS_OP_CHMOD, g_conf.fakeclient_op_chmod );
+  op_dist.add( CEPH_MDS_OP_CHOWN, g_conf.fakeclient_op_chown );
+
+  op_dist.add( CEPH_MDS_OP_READDIR, g_conf.fakeclient_op_readdir );
+  op_dist.add( CEPH_MDS_OP_MKNOD, g_conf.fakeclient_op_mknod );
+  op_dist.add( CEPH_MDS_OP_LINK, g_conf.fakeclient_op_link );
+  op_dist.add( CEPH_MDS_OP_UNLINK, g_conf.fakeclient_op_unlink );
+  op_dist.add( CEPH_MDS_OP_RENAME, g_conf.fakeclient_op_rename );
+
+  op_dist.add( CEPH_MDS_OP_MKDIR, g_conf.fakeclient_op_mkdir );
+  op_dist.add( CEPH_MDS_OP_RMDIR, g_conf.fakeclient_op_rmdir );
+  op_dist.add( CEPH_MDS_OP_SYMLINK, g_conf.fakeclient_op_symlink );
+
+  op_dist.add( CEPH_MDS_OP_OPEN, g_conf.fakeclient_op_openrd );
+  //op_dist.add( CEPH_MDS_OP_READ, g_conf.fakeclient_op_read );
+  //op_dist.add( CEPH_MDS_OP_WRITE, g_conf.fakeclient_op_write );
+  op_dist.add( CEPH_MDS_OP_TRUNCATE, g_conf.fakeclient_op_truncate );
+  op_dist.add( CEPH_MDS_OP_FSYNC, g_conf.fakeclient_op_fsync );
+  //op_dist.add( CEPH_MDS_OP_RELEASE, g_conf.fakeclient_op_close );  // actually, close()
   op_dist.normalize();
 }
 
@@ -2315,7 +2315,7 @@ int SyntheticClient::random_walk(int num_req)
         dout(DBL) << "empty dir, up" << dendl;
         up();
       } else
-        op = MDS_OP_READDIR;
+        op = CEPH_MDS_OP_READDIR;
     } else {
       op = op_dist.sample();
     }
@@ -2324,52 +2324,52 @@ int SyntheticClient::random_walk(int num_req)
     int r = 0;
 
     // do op
-    if (op == MDS_OP_UNLINK) {
+    if (op == CEPH_MDS_OP_UNLINK) {
       if (contents.empty())
-        op = MDS_OP_READDIR;
+        op = CEPH_MDS_OP_READDIR;
       else 
         r = client->unlink( get_random_sub() );   // will fail on dirs
     }
      
-    if (op == MDS_OP_RENAME) {
+    if (op == CEPH_MDS_OP_RENAME) {
       if (contents.empty())
-        op = MDS_OP_READDIR;
+        op = CEPH_MDS_OP_READDIR;
       else {
         r = client->rename( get_random_sub(), make_sub("ren") );
       }
     }
     
-    if (op == MDS_OP_MKDIR) {
+    if (op == CEPH_MDS_OP_MKDIR) {
       r = client->mkdir( make_sub("mkdir"), 0755);
     }
     
-    if (op == MDS_OP_RMDIR) {
+    if (op == CEPH_MDS_OP_RMDIR) {
       if (!subdirs.empty())
         r = client->rmdir( get_random_subdir() );
       else
         r = client->rmdir( cwd.c_str() );     // will pbly fail
     }
     
-    if (op == MDS_OP_SYMLINK) {
+    if (op == CEPH_MDS_OP_SYMLINK) {
     }
     
-    if (op == MDS_OP_CHMOD) {
+    if (op == CEPH_MDS_OP_CHMOD) {
       if (contents.empty())
-        op = MDS_OP_READDIR;
+        op = CEPH_MDS_OP_READDIR;
       else
         r = client->chmod( get_random_sub(), rand() & 0755 );
     }
     
-    if (op == MDS_OP_CHOWN) {
+    if (op == CEPH_MDS_OP_CHOWN) {
       if (contents.empty())         r = client->chown( cwd.c_str(), rand(), rand() );
       else
         r = client->chown( get_random_sub(), rand(), rand() );
     }
      
-    if (op == MDS_OP_LINK) {
+    if (op == CEPH_MDS_OP_LINK) {
     }
      
-    if (op == MDS_OP_UTIME) {
+    if (op == CEPH_MDS_OP_UTIME) {
       struct utimbuf b;
       memset(&b, 1, sizeof(b));
       if (contents.empty()) 
@@ -2378,13 +2378,13 @@ int SyntheticClient::random_walk(int num_req)
         r = client->utime( get_random_sub(), &b );
     }
     
-    if (op == MDS_OP_MKNOD) {
+    if (op == CEPH_MDS_OP_MKNOD) {
       r = client->mknod( make_sub("mknod"), 0644);
     }
      
-    if (op == MDS_OP_OPEN) {
+    if (op == CEPH_MDS_OP_OPEN) {
       if (contents.empty())
-        op = MDS_OP_READDIR;
+        op = CEPH_MDS_OP_READDIR;
       else {
         r = client->open( get_random_sub(), O_RDONLY );
         if (r > 0) {
@@ -2394,17 +2394,18 @@ int SyntheticClient::random_walk(int num_req)
       }
     }
 
-    if (op == MDS_OP_RELEASE) {   // actually, close
+    /*if (op == CEPH_MDS_OP_RELEASE) {   // actually, close
       if (open_files.empty())
-        op = MDS_OP_STAT;
+        op = CEPH_MDS_OP_STAT;
       else {
         int fh = get_random_fh();
         r = client->close( fh );
         if (r == 0) open_files.erase(fh);
       }
     }
+    */
     
-    if (op == MDS_OP_STAT) {
+    if (op == CEPH_MDS_OP_STAT) {
       struct stat st;
       if (contents.empty()) {
         if (did_readdir) {
@@ -2412,15 +2413,15 @@ int SyntheticClient::random_walk(int num_req)
             dout(DBL) << "stat in empty dir, up" << dendl;
             up();
           } else {
-            op = MDS_OP_MKNOD;
+            op = CEPH_MDS_OP_MKNOD;
           }
         } else
-          op = MDS_OP_READDIR;
+          op = CEPH_MDS_OP_READDIR;
       } else
         r = client->lstat(get_random_sub(), &st);
     }
 
-    if (op == MDS_OP_READDIR) {
+    if (op == CEPH_MDS_OP_READDIR) {
       clear_dir();
       
       list<string> c;

diff --git a/trunk/ceph/include/ceph_fs.h b/trunk/ceph/include/ceph_fs.h
index b815ed323edb6ff8db24e59b6555859dd3a08878..c185d0182d7ccff7f681d25d2d41a131de8b545d 100644 (file)
--- a/trunk/ceph/include/ceph_fs.h
+++ b/trunk/ceph/include/ceph_fs.h
@@ -267,6 +267,30 @@ enum {
        CEPH_SESSION_CLOSE
 };
 
+enum {
+       CEPH_MDS_OP_STAT = 100,
+       CEPH_MDS_OP_LSTAT = 101,
+       CEPH_MDS_OP_FSTAT = 102,
+       CEPH_MDS_OP_UTIME = 1103,
+       CEPH_MDS_OP_CHMOD = 1104,
+       CEPH_MDS_OP_CHOWN = 1105,
+
+       CEPH_MDS_OP_READDIR = 200,
+       CEPH_MDS_OP_MKNOD = 1201,
+       CEPH_MDS_OP_LINK = 1202,
+       CEPH_MDS_OP_UNLINK = 1203,
+       CEPH_MDS_OP_RENAME = 1204,
+
+       CEPH_MDS_OP_MKDIR = 1220,
+       CEPH_MDS_OP_RMDIR = 1221,
+       CEPH_MDS_OP_SYMLINK = 1222,
+
+       CEPH_MDS_OP_OPEN = 301,
+       CEPH_MDS_OP_TRUNCATE = 1303,
+       CEPH_MDS_OP_FSYNC = 303
+};
+
+
 /* client_request */
 
 struct ceph_client_request_head {

diff --git a/trunk/ceph/mds/MDCache.cc b/trunk/ceph/mds/MDCache.cc
index 48ea6e8fec0cca2384b268c2641efa659abea8e2..af4dfdec9ce03528fc6250a8b5a9f3ae5d5dbeee 100644 (file)
--- a/trunk/ceph/mds/MDCache.cc
+++ b/trunk/ceph/mds/MDCache.cc
@@ -4860,7 +4860,7 @@ void MDCache::reintegrate_stray(CDentry *straydn, CDentry *rdn)
   filepath dst;
   rdn->make_path(dst);
 
-  MClientRequest *req = new MClientRequest(MDS_OP_RENAME, mds->messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_RENAME, mds->messenger->get_myinst());
   req->set_filepath(src);
   req->set_filepath2(dst);
   req->set_tid(mds->issue_tid());
@@ -4880,7 +4880,7 @@ void MDCache::migrate_stray(CDentry *dn, int from, int to)
   filepath src(dname, MDS_INO_STRAY(from));
   filepath dst(dname, MDS_INO_STRAY(to));
 
-  MClientRequest *req = new MClientRequest(MDS_OP_RENAME, mds->messenger->get_myinst());
+  MClientRequest *req = new MClientRequest(CEPH_MDS_OP_RENAME, mds->messenger->get_myinst());
   req->set_filepath(src);
   req->set_filepath2(dst);
   req->set_tid(mds->issue_tid());

diff --git a/trunk/ceph/mds/Server.cc b/trunk/ceph/mds/Server.cc
index db29e00b4f1a662e6f20b382b3dfe076ffd60218..404d2de39cf39dfc20c5b43010894095b983c70a 100644 (file)
--- a/trunk/ceph/mds/Server.cc
+++ b/trunk/ceph/mds/Server.cc
@@ -539,19 +539,19 @@ void Server::handle_client_request(MClientRequest *req)
   // -----
   // some ops are on ino's
   switch (req->get_op()) {
-  case MDS_OP_FSTAT:
+  case CEPH_MDS_OP_FSTAT:
     ref = mdcache->get_inode(req->head.args.fstat.ino);
     assert(ref);
     break;
     
-  case MDS_OP_TRUNCATE:
+  case CEPH_MDS_OP_TRUNCATE:
     if (!req->head.args.truncate.ino) 
       break;   // can be called w/ either fh OR path
     ref = mdcache->get_inode(req->head.args.truncate.ino);
     assert(ref);
     break;
     
-  case MDS_OP_FSYNC:
+  case CEPH_MDS_OP_FSYNC:
     ref = mdcache->get_inode(req->head.args.fsync.ino);   // fixme someday no ino needed?
     assert(ref);
     break;
@@ -590,31 +590,31 @@ void Server::dispatch_client_request(MDRequest *mdr)
   switch (req->get_op()) {
 
     // inodes ops.
-  case MDS_OP_STAT:
-  case MDS_OP_LSTAT:
+  case CEPH_MDS_OP_STAT:
+  case CEPH_MDS_OP_LSTAT:
     handle_client_stat(mdr);
     break;
-  case MDS_OP_UTIME:
+  case CEPH_MDS_OP_UTIME:
     handle_client_utime(mdr);
     break;
-  case MDS_OP_CHMOD:
+  case CEPH_MDS_OP_CHMOD:
     handle_client_chmod(mdr);
     break;
-  case MDS_OP_CHOWN:
+  case CEPH_MDS_OP_CHOWN:
     handle_client_chown(mdr);
     break;
-  case MDS_OP_TRUNCATE:
+  case CEPH_MDS_OP_TRUNCATE:
     handle_client_truncate(mdr);
     break;
-  case MDS_OP_READDIR:
+  case CEPH_MDS_OP_READDIR:
     handle_client_readdir(mdr);
     break;
-  case MDS_OP_FSYNC:
+  case CEPH_MDS_OP_FSYNC:
     //handle_client_fsync(req, ref);
     break;
 
     // funky.
-  case MDS_OP_OPEN:
+  case CEPH_MDS_OP_OPEN:
     if (req->head.args.open.flags & O_CREAT)
       handle_client_openc(mdr);
     else 
@@ -623,23 +623,23 @@ void Server::dispatch_client_request(MDRequest *mdr)
 
     // namespace.
     // no prior locks.
-  case MDS_OP_MKNOD:
+  case CEPH_MDS_OP_MKNOD:
     handle_client_mknod(mdr);
     break;
-  case MDS_OP_LINK:
+  case CEPH_MDS_OP_LINK:
     handle_client_link(mdr);
     break;
-  case MDS_OP_UNLINK:
-  case MDS_OP_RMDIR:
+  case CEPH_MDS_OP_UNLINK:
+  case CEPH_MDS_OP_RMDIR:
     handle_client_unlink(mdr);
     break;
-  case MDS_OP_RENAME:
+  case CEPH_MDS_OP_RENAME:
     handle_client_rename(mdr);
     break;
-  case MDS_OP_MKDIR:
+  case CEPH_MDS_OP_MKDIR:
     handle_client_mkdir(mdr);
     break;
-  case MDS_OP_SYMLINK:
+  case CEPH_MDS_OP_SYMLINK:
     handle_client_symlink(mdr);
     break;
 
@@ -2301,7 +2301,7 @@ void Server::handle_client_unlink(MDRequest *mdr)
 
   // rmdir or unlink?
   bool rmdir = false;
-  if (req->get_op() == MDS_OP_RMDIR) rmdir = true;
+  if (req->get_op() == CEPH_MDS_OP_RMDIR) rmdir = true;
   
   if (rmdir) {
     dout(7) << "handle_client_rmdir on " << *dn << dendl;

diff --git a/trunk/ceph/messages/MClientRequest.h b/trunk/ceph/messages/MClientRequest.h
index d8fd180a46a25cd9cd7277bdbb84049252233232..3212f795d60eee73a0db1056987877c4a2f9305a 100644 (file)
--- a/trunk/ceph/messages/MClientRequest.h
+++ b/trunk/ceph/messages/MClientRequest.h
@@ -46,31 +46,6 @@
 
 // metadata ops.
 //  >=1000 --> an update, non-idempotent (i.e. an update)
-#define MDS_OP_STATFS   1
-
-#define MDS_OP_STAT     100
-#define MDS_OP_LSTAT    101
-#define MDS_OP_FSTAT    102
-#define MDS_OP_UTIME    1102
-#define MDS_OP_CHMOD    1104
-#define MDS_OP_CHOWN    1105  
-
-#define MDS_OP_READDIR  200
-#define MDS_OP_MKNOD    1201
-#define MDS_OP_LINK     1202
-#define MDS_OP_UNLINK   1203
-#define MDS_OP_RENAME   1204
-
-#define MDS_OP_MKDIR    1220
-#define MDS_OP_RMDIR    1221
-#define MDS_OP_SYMLINK  1222
-
-#define MDS_OP_OPEN     301
-#define MDS_OP_TRUNCATE 1306
-#define MDS_OP_FSYNC    307
-
-#define MDS_OP_RELEASE  308  // used only by SyntheticClient op_dist thinger
-
 
 class MClientRequest : public Message {
 public:
@@ -112,37 +87,37 @@ public:
     return get_open_file_mode() == FILE_MODE_R;
   }
   bool is_idempotent() {
-    if (head.op == MDS_OP_OPEN) 
+    if (head.op == CEPH_MDS_OP_OPEN) 
       return open_file_mode_is_readonly();
     return (head.op < 1000);
   }
   bool auth_is_best() {
     if (!is_idempotent()) return true;
-    if (head.op == MDS_OP_READDIR) return true;
+    if (head.op == CEPH_MDS_OP_READDIR) return true;
     return false;    
   }
   bool follow_trailing_symlink() {
     switch (head.op) {
-    case MDS_OP_LSTAT:
-    case MDS_OP_FSTAT:
-    case MDS_OP_LINK:
-    case MDS_OP_UNLINK:
-    case MDS_OP_RENAME:
+    case CEPH_MDS_OP_LSTAT:
+    case CEPH_MDS_OP_FSTAT:
+    case CEPH_MDS_OP_LINK:
+    case CEPH_MDS_OP_UNLINK:
+    case CEPH_MDS_OP_RENAME:
       return false;
       
-    case MDS_OP_STAT:
-    case MDS_OP_UTIME:
-    case MDS_OP_CHMOD:
-    case MDS_OP_CHOWN:
-    case MDS_OP_READDIR:
-    case MDS_OP_OPEN:
-    case MDS_OP_TRUNCATE:
-
-    case MDS_OP_FSYNC:
-    case MDS_OP_MKNOD:
-    case MDS_OP_MKDIR:
-    case MDS_OP_RMDIR:
-    case MDS_OP_SYMLINK:
+    case CEPH_MDS_OP_STAT:
+    case CEPH_MDS_OP_UTIME:
+    case CEPH_MDS_OP_CHMOD:
+    case CEPH_MDS_OP_CHOWN:
+    case CEPH_MDS_OP_READDIR:
+    case CEPH_MDS_OP_OPEN:
+    case CEPH_MDS_OP_TRUNCATE:
+
+    case CEPH_MDS_OP_FSYNC:
+    case CEPH_MDS_OP_MKNOD:
+    case CEPH_MDS_OP_MKDIR:
+    case CEPH_MDS_OP_RMDIR:
+    case CEPH_MDS_OP_SYMLINK:
       return true;
 
     default:
@@ -214,47 +189,44 @@ public:
        << "." << get_tid() 
        << " ";
     switch(get_op()) {
-    case MDS_OP_STATFS: 
-      out << "statfs"; break;
-
-    case MDS_OP_STAT: 
+    case CEPH_MDS_OP_STAT: 
       out << "stat"; break;
-    case MDS_OP_LSTAT: 
+    case CEPH_MDS_OP_LSTAT: 
       out << "lstat"; break;
-    case MDS_OP_FSTAT: 
+    case CEPH_MDS_OP_FSTAT: 
       out << "fstat"; break;
-    case MDS_OP_UTIME: 
+    case CEPH_MDS_OP_UTIME: 
       out << "utime"; break;
-    case MDS_OP_CHMOD: 
+    case CEPH_MDS_OP_CHMOD: 
       out << "chmod"; break;
-    case MDS_OP_CHOWN: 
+    case CEPH_MDS_OP_CHOWN: 
       out << "chown"; break;
       
-    case MDS_OP_READDIR: 
+    case CEPH_MDS_OP_READDIR: 
       out << "readdir"; break;
-    case MDS_OP_MKNOD: 
+    case CEPH_MDS_OP_MKNOD: 
       out << "mknod"; break;
-    case MDS_OP_LINK: 
+    case CEPH_MDS_OP_LINK: 
       out << "link"; break;
-    case MDS_OP_UNLINK:
+    case CEPH_MDS_OP_UNLINK:
       out << "unlink"; break;
-    case MDS_OP_RENAME:
+    case CEPH_MDS_OP_RENAME:
       out << "rename"; break;
       
-    case MDS_OP_MKDIR: 
+    case CEPH_MDS_OP_MKDIR: 
       out << "mkdir"; break;
-    case MDS_OP_RMDIR: 
+    case CEPH_MDS_OP_RMDIR: 
       out << "rmdir"; break;
-    case MDS_OP_SYMLINK: 
+    case CEPH_MDS_OP_SYMLINK: 
       out << "symlink"; break;
       
-    case MDS_OP_OPEN: 
+    case CEPH_MDS_OP_OPEN: 
       out << "open"; break;
-    case MDS_OP_TRUNCATE: 
+    case CEPH_MDS_OP_TRUNCATE: 
       out << "truncate"; break;
-    case MDS_OP_FSYNC: 
+    case CEPH_MDS_OP_FSYNC: 
       out << "fsync"; break;
-      //    case MDS_OP_RELEASE: 
+      //    case CEPH_MDS_OP_RELEASE: 
       //out << "release"; break;
     default: 
       out << "unknown=" << get_op();