summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log.c
diff options
context:
space:
mode:
authorFelix Blyakher2009-02-09 18:52:34 +0100
committerFelix Blyakher2009-02-09 18:52:34 +0100
commit8e08f6eb34af13b78d379a025e4c9f8612b47b95 (patch)
tree663bb4dcfa4552bb8daf19055d7e4d86a0ad84c2 /fs/xfs/xfs_log.c
parentMerge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs (diff)
parentxfs: get rid of indirections in the quotaops implementation (diff)
downloadkernel-qcow2-linux-8e08f6eb34af13b78d379a025e4c9f8612b47b95.tar.gz
kernel-qcow2-linux-8e08f6eb34af13b78d379a025e4c9f8612b47b95.tar.xz
kernel-qcow2-linux-8e08f6eb34af13b78d379a025e4c9f8612b47b95.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
Diffstat (limited to 'fs/xfs/xfs_log.c')
-rw-r--r--fs/xfs/xfs_log.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index f4726f702a9e..493c07f6a99a 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1164,32 +1164,8 @@ xlog_get_iclog_buffer_size(xfs_mount_t *mp,
log->l_iclog_hsize = BBSIZE;
log->l_iclog_heads = 1;
- /*
- * For 16KB, we use 3 32KB buffers. For 32KB block sizes, we use
- * 4 32KB buffers. For 64KB block sizes, we use 8 32KB buffers.
- */
- if (mp->m_sb.sb_blocksize >= 16*1024) {
- log->l_iclog_size = XLOG_BIG_RECORD_BSIZE;
- log->l_iclog_size_log = XLOG_BIG_RECORD_BSHIFT;
- if (mp->m_logbufs <= 0) {
- switch (mp->m_sb.sb_blocksize) {
- case 16*1024: /* 16 KB */
- log->l_iclog_bufs = 3;
- break;
- case 32*1024: /* 32 KB */
- log->l_iclog_bufs = 4;
- break;
- case 64*1024: /* 64 KB */
- log->l_iclog_bufs = 8;
- break;
- default:
- xlog_panic("XFS: Invalid blocksize");
- break;
- }
- }
- }
-
-done: /* are we being asked to make the sizes selected above visible? */
+done:
+ /* are we being asked to make the sizes selected above visible? */
if (mp->m_logbufs == 0)
mp->m_logbufs = log->l_iclog_bufs;
if (mp->m_logbsize == 0)