From: Sage Weil <sage@newdream.net>
Date: Wed, 2 Sep 2009 23:33:59 +0000 (-0700)
Subject: mds: use 0 for layout defaults, not -1
X-Git-Tag: v0.14~51^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7fbab986b69d2a3143541493dbd613d18bd30a0;p=ceph.git

mds: use 0 for layout defaults, not -1

This simplifies callers that zero the structs.  And 0 is
clearly an illegal value, so it's safe to mean 'use the
default'.
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 6c9e1238fcf..8be4116f89f 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -125,10 +125,10 @@ Client::Client(Messenger *m, MonClient *mc) : timer(client_lock), client_lock("C
 
   cwd = NULL;
 
-  file_stripe_unit = -1;
-  file_stripe_count = -1;
-  object_size = -1;
-  file_replication = -1;
+  file_stripe_unit = 0;
+  file_stripe_count = 0;
+  object_size = 0;
+  file_replication = 0;
 
   // 
   root = 0;
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index fe1b59a56cc..eda9c16a6b2 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -2101,13 +2101,13 @@ void Server::handle_client_openc(MDRequest *mdr)
   }
   in->inode.rstat.rfiles = 1;
 
-  if (req->head.args.open.stripe_unit != 0xffffffff)
+  if (req->head.args.open.stripe_unit)
     in->inode.layout.fl_stripe_unit = req->head.args.open.stripe_unit;
-  if (req->head.args.open.stripe_count != 0xffffffff)
+  if (req->head.args.open.stripe_count)
     in->inode.layout.fl_stripe_count = req->head.args.open.stripe_count;
-  if (req->head.args.open.object_size != 0xffffffff)
+  if (req->head.args.open.object_size)
     in->inode.layout.fl_object_size = req->head.args.open.object_size;
-  /*if(req->head.args->open.file_replication != 0xffffffff)
+  /*if(req->head.args->open.file_replication)
     in->inode.layout.fl_pg_pool.set_size(req->head.args.open.file_replication);
   */