staging/lustre/llite: remove unused ll_max_rw_chunk

ll_max_rw_chunk seems to be unused ever since we implemented CLIO in 2.0,
so remove it and all supporting infrastructure.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h
index c4c758cac12ae03970e9c0d901584a3c2c3ef2af..e180912d0e08ba3eeec98029f809adcb17af27e8 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@ -487,9 +487,6 @@ struct ll_sb_info {
        unsigned int          ll_namelen;
        struct file_operations   *ll_fop;
 
-       /* =0 - hold lock over whole read/write
-        * >0 - max. chunk to be read/written w/o lock re-acquiring */
-       unsigned long        ll_max_rw_chunk;
        unsigned int          ll_md_brw_size; /* used by readdir */
 
        struct lu_site     *ll_site;
@@ -523,8 +520,6 @@ struct ll_sb_info {
        struct completion        ll_kobj_unregister;
 };
 
-#define LL_DEFAULT_MAX_RW_CHUNK      (32 * 1024 * 1024)
-
 struct ll_ra_read {
        pgoff_t      lrr_start;
        pgoff_t      lrr_count;

diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index 1b42304e0bd1046955da1105a101c47bafc6e7f6..4c9fd4acedeaab563ee4560f04e3ea2795350131 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -315,7 +315,6 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
        sb->s_magic = LL_SUPER_MAGIC;
        sb->s_maxbytes = MAX_LFS_FILESIZE;
        sbi->ll_namelen = osfs->os_namelen;
-       sbi->ll_max_rw_chunk = LL_DEFAULT_MAX_RW_CHUNK;
 
        if ((sbi->ll_flags & LL_SBI_USER_XATTR) &&
            !(data->ocd_connect_flags & OBD_CONNECT_XATTR)) {

diff --git a/drivers/staging/lustre/lustre/llite/lproc_llite.c b/drivers/staging/lustre/lustre/llite/lproc_llite.c
index 99d96d7a283edece345d1ae97331cfe6d81ca1a1..da08edeceda9910cf0c58a3727395394cd24d45b 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/lproc_llite.c
+++ b/drivers/staging/lustre/lustre/llite/lproc_llite.c
@@ -520,29 +520,6 @@ static ssize_t checksum_pages_store(struct kobject *kobj,
 }
 LUSTRE_RW_ATTR(checksum_pages);
 
-static int ll_max_rw_chunk_seq_show(struct seq_file *m, void *v)
-{
-       struct super_block *sb = m->private;
-
-       seq_printf(m, "%lu\n", ll_s2sbi(sb)->ll_max_rw_chunk);
-       return 0;
-}
-
-static ssize_t ll_max_rw_chunk_seq_write(struct file *file,
-                                        const char __user *buffer,
-                                        size_t count, loff_t *off)
-{
-       struct super_block *sb = ((struct seq_file *)file->private_data)->private;
-       int rc, val;
-
-       rc = lprocfs_write_helper(buffer, count, &val);
-       if (rc)
-               return rc;
-       ll_s2sbi(sb)->ll_max_rw_chunk = val;
-       return count;
-}
-LPROC_SEQ_FOPS(ll_max_rw_chunk);
-
 static int ll_rd_track_id(struct seq_file *m, enum stats_track_type type)
 {
        struct super_block *sb = m->private;
@@ -852,7 +829,6 @@ static struct lprocfs_vars lprocfs_llite_obd_vars[] = {
        { "site",         &ll_site_stats_fops,    NULL, 0 },
        /* { "filegroups",   lprocfs_rd_filegroups,  0, 0 }, */
        { "max_cached_mb",    &ll_max_cached_mb_fops, NULL },
-       { "max_rw_chunk",     &ll_max_rw_chunk_fops, NULL },
        { "stats_track_pid",  &ll_track_pid_fops, NULL },
        { "stats_track_ppid", &ll_track_ppid_fops, NULL },
        { "stats_track_gid",  &ll_track_gid_fops, NULL },