Merge branch 'audit.b32' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[linux-2.6] / fs / nfsd / nfssvc.c

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 0603baad54266708f9e336669c0158d791845a50..6fa6340a5fb892e217e180218d3199bc4e4b3e55 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -209,7 +209,7 @@ int nfsd_create_serv(void)
                 * Of course, this is only a default.
                 */
                nfsd_max_blksize = NFSSVC_MAXBLKSIZE;
-               i.totalram >>= 12;
+               i.totalram <<= PAGE_SHIFT - 12;
                while (nfsd_max_blksize > i.totalram &&
                       nfsd_max_blksize >= 8*1024*2)
                        nfsd_max_blksize /= 2;