From 3e72893152a9ef7c72b510460a6c80cda043ad48 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Tue, 15 Jan 2013 17:48:46 -0800 Subject: [PATCH] client: rename client/SnapRealm files to avoid automake build conflict We are about to move the MDS' SnapRealm into its own files, which conflicts. The MDS is more important, so it wins the "SnapRealm" filename and we move the client stuff to ClientSnapRealm.[h|cc]. Signed-off-by: Sage Weil Signed-off-by: Greg Farnum --- src/Makefile.am | 4 ++-- src/client/Client.cc | 2 +- src/client/{SnapRealm.cc => ClientSnapRealm.cc} | 2 +- src/client/{SnapRealm.h => ClientSnapRealm.h} | 0 src/client/Inode.cc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename src/client/{SnapRealm.cc => ClientSnapRealm.cc} (97%) rename src/client/{SnapRealm.h => ClientSnapRealm.h} (100%) diff --git a/src/Makefile.am b/src/Makefile.am index d4f52d073fc76..b0b7179dda448 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1412,7 +1412,7 @@ libclient_la_SOURCES = \ client/Inode.cc \ client/Dentry.cc \ client/MetaRequest.cc \ - client/SnapRealm.cc \ + client/ClientSnapRealm.cc \ client/MetaSession.cc \ client/Trace.cc libclient_la_LIBADD = libosdc.la $(LIBEDIT_LIBS) @@ -1464,7 +1464,7 @@ noinst_HEADERS = \ client/Inode.h\ client/MetaRequest.h\ client/MetaSession.h\ - client/SnapRealm.h\ + client/ClientSnapRealm.h\ client/SyntheticClient.h\ client/Trace.h\ client/fuse_ll.h\ diff --git a/src/client/Client.cc b/src/client/Client.cc index 6cff22be9f0e6..e5e5272ee0b61 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -73,7 +73,7 @@ using namespace std; #include "Inode.h" #include "Dentry.h" #include "Dir.h" -#include "SnapRealm.h" +#include "ClientSnapRealm.h" #include "Fh.h" #include "MetaSession.h" #include "MetaRequest.h" diff --git a/src/client/SnapRealm.cc b/src/client/ClientSnapRealm.cc similarity index 97% rename from src/client/SnapRealm.cc rename to src/client/ClientSnapRealm.cc index 6a5918a058913..3656fbdf5052d 100644 --- a/src/client/SnapRealm.cc +++ b/src/client/ClientSnapRealm.cc @@ -1,7 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include "SnapRealm.h" +#include "ClientSnapRealm.h" #include "common/Formatter.h" void SnapRealm::dump(Formatter *f) const diff --git a/src/client/SnapRealm.h b/src/client/ClientSnapRealm.h similarity index 100% rename from src/client/SnapRealm.h rename to src/client/ClientSnapRealm.h diff --git a/src/client/Inode.cc b/src/client/Inode.cc index 4b0c99d5764da..60bc489b3c783 100644 --- a/src/client/Inode.cc +++ b/src/client/Inode.cc @@ -5,7 +5,7 @@ #include "Inode.h" #include "Dentry.h" #include "Dir.h" -#include "SnapRealm.h" +#include "ClientSnapRealm.h" ostream& operator<<(ostream &out, Inode &in) { -- 2.39.5