]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/FileJournal: compare like types in MAX()
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Wed, 9 Feb 2011 14:28:41 +0000 (06:28 -0800)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Wed, 9 Feb 2011 14:28:41 +0000 (06:28 -0800)
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
src/os/FileJournal.cc

index 221dc9db229e863cfe804f26e35c63d639cb64c3..ed65e37be54cc8eef72ff1071f3650f165c5d819 100644 (file)
@@ -289,7 +289,7 @@ int FileJournal::_open_file(int64_t oldsize, blksize_t blksize,
   else {
     max_size = oldsize;
   }
-  block_size = MAX(blksize, PAGE_SIZE);
+  block_size = MAX(blksize, (blksize_t)PAGE_SIZE);
 
   dout(10) << "_open journal is not a block device, NOT checking disk "
            << "write cache on '" << fn << "'" << dendl;