2 files changed, 3 insertions, 26 deletions

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 52f1e2136546..8810fda0da46 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -17,8 +17,6 @@
 #include <linux/writeback.h>
 #include <linux/quotaops.h>
 
-extern int reiserfs_default_io_size;    /* default io size devuned in super.c */
-
 static int reiserfs_commit_write(struct file *f, struct page *page,
                                  unsigned from, unsigned to);
 static int reiserfs_prepare_write(struct file *f, struct page *page,
@@ -1122,7 +1120,6 @@ static void init_inode(struct inode *inode, struct path *path)
         ih = PATH_PITEM_HEAD(path);
 
         copy_key(INODE_PKEY(inode), &(ih->ih_key));
-        inode->i_blksize = reiserfs_default_io_size;
 
         INIT_LIST_HEAD(&(REISERFS_I(inode)->i_prealloc_list));
         REISERFS_I(inode)->i_flags = 0;
@@ -1877,7 +1874,6 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
         }
         // these do not go to on-disk stat data
         inode->i_ino = le32_to_cpu(ih.ih_key.k_objectid);
-        inode->i_blksize = reiserfs_default_io_size;
 
         // store in in-core inode the key of stat data and version all
         // object items will have (directory items will have old offset
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 5567328f1041..b40d4d64d598 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -530,9 +530,7 @@ static int init_inodecache(void)
 
 static void destroy_inodecache(void)
 {
-        if (kmem_cache_destroy(reiserfs_inode_cachep))
-                reiserfs_warning(NULL,
-                                 "reiserfs_inode_cache: not all structures were freed");
+        kmem_cache_destroy(reiserfs_inode_cachep);
 }
 
 /* we don't mark inodes dirty, we just log them */
@@ -725,12 +723,6 @@ static const arg_desc_t error_actions[] = {
         {NULL, 0, 0},
 };
 
-int reiserfs_default_io_size = 128 * 1024;      /* Default recommended I/O size is 128k.
-                                                   There might be broken applications that are
-                                                   confused by this. Use nolargeio mount option
-                                                   to get usual i/o size = PAGE_SIZE.
-                                                 */
-
 /* proceed only one option from a list *cur - string containing of mount options
    opts - array of options which are accepted
    opt_arg - if option is found and requires an argument and if it is specifed
@@ -959,19 +951,8 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
                 }
 
                 if (c == 'w') {
-                        char *p = NULL;
-                        int val = simple_strtoul(arg, &p, 0);
-
-                        if (*p != '\0') {
-                                reiserfs_warning(s,
-                                                 "reiserfs_parse_options: non-numeric value %s for nolargeio option",
-                                                 arg);
-                                return 0;
-                        }
-                        if (val)
-                                reiserfs_default_io_size = PAGE_SIZE;
-                        else
-                                reiserfs_default_io_size = 128 * 1024;
+                        reiserfs_warning(s, "reiserfs: nolargeio option is no longer supported");
+                        return 0;
                 }
 
                 if (c == 'j') {