From patchwork Mon Jul 27 14:22:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 6874521 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 029BA9F380 for ; Mon, 27 Jul 2015 14:22:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3AF3A2034B for ; Mon, 27 Jul 2015 14:22:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DCDD1202E6 for ; Mon, 27 Jul 2015 14:22:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754313AbbG0OWw (ORCPT ); Mon, 27 Jul 2015 10:22:52 -0400 Received: from imap.thunk.org ([74.207.234.97]:46582 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754318AbbG0OWv (ORCPT ); Mon, 27 Jul 2015 10:22:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=thunk.org; s=ef5046eb; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=+C7D6Mngs/ZmMKx5gbdIFG7QmK/gOkNc29yAnoT8elw=; b=C3OtubI1Jask/jxDMgm0OpBCo+c5AIfvjol2cOO/JlenHPVPUyn6y/wcNQdsIW5dMeieEz3Hu3ON3u1J/oA1x7JDPMFv4l9y5CRZIefnwOXmKcGvMGEgQ89343nMM1rFw9bjT300l6pMRTQBm0KzkMvEG0r8xFdVk3oQynw5Htc=; Received: from root (helo=closure.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.84) (envelope-from ) id 1ZJjIp-0006x9-Bq; Mon, 27 Jul 2015 14:22:51 +0000 Received: by closure.thunk.org (Postfix, from userid 15806) id 15B8D828D99; Mon, 27 Jul 2015 10:22:50 -0400 (EDT) From: Theodore Ts'o To: fstests@vger.kernel.org Cc: Theodore Ts'o Subject: [PATCH 1/4] xfstests: if DEV_BSIZE is not defined, assume it to be 512 Date: Mon, 27 Jul 2015 10:22:44 -0400 Message-Id: <1438006967-18815-2-git-send-email-tytso@mit.edu> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1438006967-18815-1-git-send-email-tytso@mit.edu> References: <1438006967-18815-1-git-send-email-tytso@mit.edu> X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Linux systems with glibc, DEV_BSIZE defines the sector size for the Linux kernel, which is 512 since the beginning of time --- and which we can't really change without breaking a huge amount of kernel code. Some non-glibc C libraries, may not define DEV_BSIZE; if it does not exist, assume that it will be 512. Signed-off-by: Theodore Ts'o --- lib/str_to_bytes.c | 4 ++++ lib/write_log.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/str_to_bytes.c b/lib/str_to_bytes.c index c0d7d97..d63e93b 100644 --- a/lib/str_to_bytes.c +++ b/lib/str_to_bytes.c @@ -44,7 +44,11 @@ ****************************************************************************/ #if linux +#ifdef DEV_BSIZE #define B_MULT DEV_BSIZE /* block size */ +#else +#define B_MULT 512 /* block size */ +#endif #endif diff --git a/lib/write_log.c b/lib/write_log.c index 8c921fc..852a2ae 100644 --- a/lib/write_log.c +++ b/lib/write_log.c @@ -62,7 +62,11 @@ #ifndef BSIZE #ifdef linux +#ifdef DEV_BSIZE #define BSIZE DEV_BSIZE +#else /* !DEV_BSIZE */ +#define BSIZE 512 +#endif /* DEV_BSIZE */ #else #define BSIZE BBSIZE #endif