From 43faaceadcb23c611e09a0aa015d47f9ad4f1145 Mon Sep 17 00:00:00 2001 From: nikita Date: Wed, 8 Nov 2006 13:01:50 +0000 Subject: [PATCH] mkfs_lustre: return journal size limit back: buffalo tests fail without this. --- lustre/utils/mkfs_lustre.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c index 50a649c..c4b937c 100644 --- a/lustre/utils/mkfs_lustre.c +++ b/lustre/utils/mkfs_lustre.c @@ -448,9 +448,13 @@ int make_lustre_backfs(struct mkfs_opts *mop) /* Journal size in MB */ if (strstr(mop->mo_mkfsopts, "-J") == NULL) { /* Choose our own default journal size */ - long journal_sz = 0; + long journal_sz = 0, max_sz; if (device_sz > 1024 * 1024) /* 1GB */ journal_sz = (device_sz / 102400) * 4; + /* man mkfs.ext3 */ + max_sz = (102400 * L_BLOCK_SIZE) >> 20; /* 400MB */ + if (journal_sz > max_sz) + journal_sz = max_sz; if (journal_sz) { sprintf(buf, " -J size=%ld", journal_sz); strcat(mop->mo_mkfsopts, buf); -- 1.8.3.1