client: rip out preferred_pg thing

This wasn't even named properly.  Blech.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 986646f83218aab9c5cec7f9ca566ade3bfd50d3..2f11812d34d4e5b6eb56452b365ede262df4324c 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -121,7 +121,6 @@ Client::Client(Messenger *m, MonClient *mc)
     file_stripe_count(0),
     object_size(0),
     file_replication(0),
-    preferred_pg(-1),
     client_lock("Client::client_lock")
 {
   monclient->set_messenger(m);
@@ -6196,7 +6195,7 @@ int Client::_create(Inode *dir, const char *name, int flags, mode_t mode, Inode
   req->head.args.open.stripe_count = file_stripe_count;
   req->head.args.open.object_size = object_size;
   req->head.args.open.file_replication = file_replication;
-  req->head.args.open.preferred = preferred_pg;
+  req->head.args.open.preferred = -1;
   req->dentry_drop = CEPH_CAP_FILE_SHARED;
   req->dentry_unless = CEPH_CAP_FILE_EXCL;
 
@@ -6221,7 +6220,6 @@ int Client::_create(Inode *dir, const char *name, int flags, mode_t mode, Inode
          << ' ' << file_stripe_count
          << ' ' << object_size
          << ' ' << file_replication
-         << ' ' << preferred_pg
          <<") = " << res << dendl;
   return res;
 
@@ -6776,14 +6774,6 @@ void Client::set_default_file_replication(int replication)
     file_replication = replication;
 }
 
-void Client::set_default_preferred_pg(int pg)
-{
-  if (pg >= -1)
-    preferred_pg = pg;
-  else
-    ldout(cct, 5) << "Attempt to set preferred_pg " << pg << " < -1!" << dendl;
-}
-
 
 // expose file layouts
 

diff --git a/src/client/Client.h b/src/client/Client.h
index e1febd21fe4ba8f438bdd5f9719b196ade2cccd4..b63313320cc1c9ffb4b5fbb927360365f58fa208 100644 (file)
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -255,7 +255,6 @@ public:
   int file_stripe_count;
   int object_size;
   int file_replication;
-  int preferred_pg;
 public:
   entity_name_t get_myname() { return messenger->get_myname(); } 
   void sync_write_commit(Inode *in);
@@ -619,7 +618,6 @@ public:
   void set_default_file_stripe_count(int count);
   void set_default_object_size(int size);
   void set_default_file_replication(int replication);
-  void set_default_preferred_pg(int osd);
 
   int enumerate_layout(int fd, vector<ObjectExtent>& result,
                       loff_t length, loff_t offset);