| Message ID | ortyeayxvm.fsf@livre.localdomain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Applied, thanks! sage On Thu, 7 Apr 2011, Alexandre Oliva wrote: > Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br> > --- > src/os/FileStore.cc | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc > index 940662c..0fb99e6 100644 > --- a/src/os/FileStore.cc > +++ b/src/os/FileStore.cc > @@ -1471,7 +1471,8 @@ void FileStore::start_logger(int whoami, utime_t tare) > char name[80]; > snprintf(name, sizeof(name), "osd.%d.fs.log", whoami); > logger = new ProfLogger(name, (ProfLogType*)&fs_logtype); > - journal->logger = logger; > + if (journal) > + journal->logger = logger; > logger_add(logger); > logger_tare(tare); > logger_start(); > @@ -1481,7 +1482,8 @@ void FileStore::stop_logger() > { > dout(10) << "stop_logger" << dendl; > if (logger) { > - journal->logger = NULL; > + if (journal) > + journal->logger = NULL; > logger_remove(logger); > delete logger; > logger = NULL; > -- > 1.7.4.2 > > > -- > Alexandre Oliva, freedom fighter http://FSFLA.org/~lxoliva/ > You must be the change you wish to see in the world. -- Gandhi > Be Free! -- http://FSFLA.org/ FSF Latin America board member > Free Software Evangelist Red Hat Brazil Compiler Engineer > -- > To unsubscribe from this list: send the line "unsubscribe ceph-devel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index 940662c..0fb99e6 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -1471,7 +1471,8 @@ void FileStore::start_logger(int whoami, utime_t tare) char name[80]; snprintf(name, sizeof(name), "osd.%d.fs.log", whoami); logger = new ProfLogger(name, (ProfLogType*)&fs_logtype); - journal->logger = logger; + if (journal) + journal->logger = logger; logger_add(logger); logger_tare(tare); logger_start(); @@ -1481,7 +1482,8 @@ void FileStore::stop_logger() { dout(10) << "stop_logger" << dendl; if (logger) { - journal->logger = NULL; + if (journal) + journal->logger = NULL; logger_remove(logger); delete logger; logger = NULL;
Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br> --- src/os/FileStore.cc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)