From 198544ad8551bddcf707236111c376efb38ca4f5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 19 Apr 2012 21:51:26 -0700 Subject: [PATCH] mds: remove preferred from ceph_file_layout Signed-off-by: Sage Weil --- src/client/Client.cc | 1 - src/common/config.cc | 2 +- src/include/ceph_fs.h | 4 ++-- src/mds/Dumper.cc | 1 - src/mds/MDCache.cc | 2 -- src/mds/Server.cc | 5 ----- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 2f11812d34d4e..243a7de16312c 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -6195,7 +6195,6 @@ 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 = -1; req->dentry_drop = CEPH_CAP_FILE_SHARED; req->dentry_unless = CEPH_CAP_FILE_EXCL; diff --git a/src/common/config.cc b/src/common/config.cc index fe664254a77f1..3c3b01893b2f5 100644 --- a/src/common/config.cc +++ b/src/common/config.cc @@ -62,7 +62,7 @@ struct ceph_file_layout g_default_file_layout = { fl_object_size: init_le32(1<<22), fl_cas_hash: init_le32(0), fl_object_stripe_unit: init_le32(0), - fl_pg_preferred : init_le32(-1), + fl_unused: init_le32(-1), fl_pg_pool : init_le32(-1), }; diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h index 032f458f5e818..5eb6d5ea515f1 100644 --- a/src/include/ceph_fs.h +++ b/src/include/ceph_fs.h @@ -48,7 +48,7 @@ struct ceph_file_layout { __le32 fl_object_stripe_unit; /* UNUSED. for per-object parity, if any */ /* object -> pg layout */ - __le32 fl_pg_preferred; /* preferred primary for pg (-1 for none) */ + __le32 fl_unused; /* unused; used to be preferred primary for pg (-1 for none) */ __le32 fl_pg_pool; /* namespace, crush ruleset, rep level */ } __attribute__ ((packed)); @@ -382,7 +382,7 @@ union ceph_mds_request_args { __le32 stripe_count; /* ... */ __le32 object_size; __le32 file_replication; - __le32 preferred; + __le32 unused; /* used to be preferred */ __le64 old_size; /* if O_TRUNC */ } __attribute__ ((packed)) open; struct { diff --git a/src/mds/Dumper.cc b/src/mds/Dumper.cc index d963c9d567c34..d68df50f0e349 100644 --- a/src/mds/Dumper.cc +++ b/src/mds/Dumper.cc @@ -189,7 +189,6 @@ void Dumper::undump(const char *dump_file) h.magic = CEPH_FS_ONDISK_MAGIC; h.layout = g_default_file_layout; - h.layout.fl_pg_preferred = -1; h.layout.fl_pg_pool = pg_pool; bufferlist hbl; diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index d6c1822cc310b..143facaf7b1d4 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -264,11 +264,9 @@ void MDCache::remove_inode(CInode *o) void MDCache::init_layouts() { default_file_layout = g_default_file_layout; - default_file_layout.fl_pg_preferred = -1; default_file_layout.fl_pg_pool = mds->mdsmap->get_data_pg_pool(); default_log_layout = g_default_file_layout; - default_log_layout.fl_pg_preferred = -1; default_log_layout.fl_pg_pool = mds->mdsmap->get_metadata_pg_pool(); } diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 8c9d152040c11..1e55e6b74615d 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -2571,7 +2571,6 @@ void Server::handle_client_openc(MDRequest *mdr) layout.fl_stripe_count = req->head.args.open.stripe_count; if (req->head.args.open.object_size) layout.fl_object_size = req->head.args.open.object_size; - layout.fl_pg_preferred = req->head.args.open.preferred; if (!ceph_file_layout_is_valid(&layout)) { dout(10) << " invalid initial file layout" << dendl; @@ -3237,8 +3236,6 @@ void Server::handle_client_setlayout(MDRequest *mdr) layout.fl_cas_hash = req->head.args.setlayout.layout.fl_cas_hash; if (req->head.args.setlayout.layout.fl_object_stripe_unit > 0) layout.fl_object_stripe_unit = req->head.args.setlayout.layout.fl_object_stripe_unit; - if (req->head.args.setlayout.layout.fl_pg_preferred != (__le32)-1) - layout.fl_pg_preferred = req->head.args.setlayout.layout.fl_pg_preferred; if (req->head.args.setlayout.layout.fl_pg_pool > 0) layout.fl_pg_pool = req->head.args.setlayout.layout.fl_pg_pool; if (!ceph_file_layout_is_valid(&layout)) { @@ -3309,8 +3306,6 @@ void Server::handle_client_setdirlayout(MDRequest *mdr) layout->layout.fl_cas_hash = req->head.args.setlayout.layout.fl_cas_hash; if (req->head.args.setlayout.layout.fl_object_stripe_unit > 0) layout->layout.fl_object_stripe_unit = req->head.args.setlayout.layout.fl_object_stripe_unit; - if (req->head.args.setlayout.layout.fl_pg_preferred != (__le32)-1) - layout->layout.fl_pg_preferred = req->head.args.setlayout.layout.fl_pg_preferred; if (req->head.args.setlayout.layout.fl_pg_pool > 0) layout->layout.fl_pg_pool = req->head.args.setlayout.layout.fl_pg_pool; if (!ceph_file_layout_is_valid(&layout->layout)) { -- 2.39.5