LU-8460 osc: max_pages_per_rpc should be chunk size aligned

[fs/lustre-release.git] / lustre / ofd / ofd_dev.c

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index 29ed5bd..be51836 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -2908,7 +2908,6 @@ static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
        ofd_slc_set(m);
        m->ofd_grant_compat_disable = 0;
        m->ofd_soft_sync_limit = OFD_SOFT_SYNC_LIMIT_DEFAULT;
-       m->ofd_brw_size = ONE_MB_BRW_SIZE;
 
        /* statfs data */
        spin_lock_init(&m->ofd_osfs_lock);
@@ -2981,6 +2980,11 @@ static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
        }
        m->ofd_blockbits = fls(osfs->os_bsize) - 1;
 
+       if (ONE_MB_BRW_SIZE < (1U << m->ofd_blockbits))
+               m->ofd_brw_size = 1U << m->ofd_blockbits;
+       else
+               m->ofd_brw_size = ONE_MB_BRW_SIZE;
+
        m->ofd_precreate_batch = OFD_PRECREATE_BATCH_DEFAULT;
        if (osfs->os_bsize * osfs->os_blocks < OFD_PRECREATE_SMALL_FS)
                m->ofd_precreate_batch = OFD_PRECREATE_BATCH_SMALL;