From patchwork Mon Jun 14 14:19:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Carns X-Patchwork-Id: 105967 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5EEj4Ob002945 for ; Mon, 14 Jun 2010 14:45:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755149Ab0FNOod (ORCPT ); Mon, 14 Jun 2010 10:44:33 -0400 Received: from mailhost.anl.gov ([130.202.113.50]:60909 "EHLO mailhost.anl.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755146Ab0FNOoc (ORCPT ); Mon, 14 Jun 2010 10:44:32 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 14 Jun 2010 14:45:05 +0000 (UTC) X-Greylist: delayed 1488 seconds by postgrey-1.27 at vger.kernel.org; Mon, 14 Jun 2010 10:44:32 EDT Received: from mailhost.anl.gov (mailhost.anl.gov [130.202.113.50]) by localhost.anl.gov (Postfix) with ESMTP id 82E2647 for ; Mon, 14 Jun 2010 09:19:44 -0500 (CDT) Received: from zimbra.anl.gov (zimbra.anl.gov [130.202.101.12]) by mailhost.anl.gov (Postfix) with ESMTP id 7D16F42 for ; Mon, 14 Jun 2010 09:19:44 -0500 (CDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra.anl.gov (Postfix) with ESMTP id 65F3819E00B9 for ; Mon, 14 Jun 2010 09:19:44 -0500 (CDT) X-Virus-Scanned: amavisd-new at zimbra.anl.gov Received: from zimbra.anl.gov ([127.0.0.1]) by localhost (zimbra.anl.gov [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X3cIEfnJDP+n for ; Mon, 14 Jun 2010 09:19:44 -0500 (CDT) Received: from [192.168.0.104] (adsl-66-176-61.asm.bellsouth.net [98.66.176.61]) by zimbra.anl.gov (Postfix) with ESMTP id 2ACA919E006E for ; Mon, 14 Jun 2010 09:19:44 -0500 (CDT) Message-ID: <4C163A7E.6060701@mcs.anl.gov> Date: Mon, 14 Jun 2010 10:19:42 -0400 From: Phil Carns User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.9) Gecko/20100423 Lightning/1.0b1 Thunderbird/3.0.4 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: minor file journal size bug Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org diff -Naupr ceph-0.20.2/src/os/FileJournal.cc ceph-0.20.2-patched/src/os/FileJournal.cc --- ceph-0.20.2/src/os/FileJournal.cc 2010-05-26 18:52:59.000000000 -0500 +++ ceph-0.20.2-patched/src/os/FileJournal.cc 2010-06-14 08:54:22.416230668 -0500 @@ -58,8 +58,8 @@ int FileJournal::_open(bool forwrite, bo max_size = st.st_size; block_size = st.st_blksize; - if (create && max_size < (g_conf.osd_journal_size << 20)) { - uint64_t newsize = g_conf.osd_journal_size << 20; + if (create && max_size < (((uint64_t)g_conf.osd_journal_size) << 20)) { + uint64_t newsize = ((uint64_t)g_conf.osd_journal_size) << 20; dout(10) << "_open extending to " << newsize << " bytes" << dendl; r = ::ftruncate(fd, newsize); if (r == 0)