From: Zengran Zhang <zhangzengran@h3c.com>
Date: Tue, 29 Mar 2016 08:40:38 +0000 (-0400)
Subject: filestore: prepare entry cleanup
X-Git-Tag: v11.0.0~640^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0d95b318efbb1bbc856a52bf4480cd736e56215;p=ceph.git

filestore: prepare entry cleanup

Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
---

diff --git a/src/os/filestore/FileJournal.cc b/src/os/filestore/FileJournal.cc
index 9e403101c35..ac151808a89 100644
--- a/src/os/filestore/FileJournal.cc
+++ b/src/os/filestore/FileJournal.cc
@@ -1604,13 +1604,12 @@ void FileJournal::check_aio_completion()
 
 int FileJournal::prepare_entry(vector<ObjectStore::Transaction>& tls, bufferlist* tbl) {
   dout(10) << "prepare_entry " << tls << dendl;
-  unsigned data_len = 0;
+  int data_len = g_conf->journal_align_min_size - 1;
   int data_align = -1; // -1 indicates that we don't care about the alignment
   bufferlist bl;
   for (vector<ObjectStore::Transaction>::iterator p = tls.begin();
       p != tls.end(); ++p) {
-   if ((*p).get_data_length() > data_len &&
-     (int)(*p).get_data_length() >= g_conf->journal_align_min_size) {
+   if ((int)(*p).get_data_length() > data_len) {
      data_len = (*p).get_data_length();
      data_align = ((*p).get_data_alignment() - bl.length()) & ~CEPH_PAGE_MASK;
     }