patch-2.4.0-test7 linux/fs/nfs/inode.c

• Lines: 23
• Date: Mon Aug 21 13:00:25 2000
• Orig file: v2.4.0-test6/linux/fs/nfs/inode.c
• Orig date: Wed Aug 9 19:19:51 2000

diff -u --recursive --new-file v2.4.0-test6/linux/fs/nfs/inode.c linux/fs/nfs/inode.c
@@ -402,9 +402,6 @@
 		server->rsize = nfs_block_size(fsinfo.rtpref, NULL);
 	if (data->wsize == 0)
 		server->wsize = nfs_block_size(fsinfo.wtpref, NULL);
-	server->dtsize = nfs_block_size(fsinfo.dtpref, NULL);
-	if (server->dtsize > PAGE_CACHE_SIZE)
-		server->dtsize = PAGE_CACHE_SIZE;
 	/* NFSv3: we don't have bsize, but rather rtmult and wtmult... */
 	if (!fsinfo.bsize)
 		fsinfo.bsize = (fsinfo.rtmult>fsinfo.wtmult) ? fsinfo.rtmult : fsinfo.wtmult;
@@ -433,6 +430,12 @@
 		server->wpages = NFS_WRITE_MAXIOV;
                 server->wsize = server->wpages << PAGE_CACHE_SHIFT;
 	}
+
+	server->dtsize = nfs_block_size(fsinfo.dtpref, NULL);
+	if (server->dtsize > PAGE_CACHE_SIZE)
+		server->dtsize = PAGE_CACHE_SIZE;
+	if (server->dtsize > server->rsize)
+		server->dtsize = server->rsize;
 
         maxlen = (version == 2) ? NFS2_MAXNAMLEN : NFS3_MAXNAMLEN;