Merge with /home/shaggy/git/linus-clean/

1 files changed, 5 insertions, 3 deletions

diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index 1b272a135a31..e897e00c2c9d 100644
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -275,7 +275,9 @@ static int __init root_nfs_parse(char *name, char *buf)
                         case Opt_noacl:
                                 nfs_data.flags |= NFS_MOUNT_NOACL;
                                 break;
-                        default : 
+                        default:
+                                printk(KERN_WARNING "Root-NFS: unknown "
+                                        "option: %s\n", p);
                                 return 0;
                 }
         }
@@ -296,8 +298,8 @@ static int __init root_nfs_name(char *name)
         nfs_port          = -1;
         nfs_data.version  = NFS_MOUNT_VERSION;
         nfs_data.flags    = NFS_MOUNT_NONLM;    /* No lockd in nfs root yet */
-        nfs_data.rsize    = NFS_DEF_FILE_IO_BUFFER_SIZE;
-        nfs_data.wsize    = NFS_DEF_FILE_IO_BUFFER_SIZE;
+        nfs_data.rsize    = NFS_DEF_FILE_IO_SIZE;
+        nfs_data.wsize    = NFS_DEF_FILE_IO_SIZE;
         nfs_data.acregmin = 3;
         nfs_data.acregmax = 60;
         nfs_data.acdirmin = 30;