]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/suse-2.6.27.39/patches.fixes/nfs-honour-server-preferred-io-size
Fix oinkmaster patch.
[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.fixes / nfs-honour-server-preferred-io-size
1 From: NeilBrown <neilb@suse.de>
2 Subject: NFS: Honour server-preferred io sizes
3 Patch-mainline: not yet
4 References: bnc#550648
5
6 When interpreting the preferred IO size sent by the server, linux/nfs
7 assumes that a non-zero setting means a user-specified setting so
8 it ignores the server specified setting.
9
10 This patch initialises rsize and wsize to zero so the server-preferred
11 values get using (if no value is specified in a mount option).
12
13 Signed-off-by: Neil Brown <neilb@suse.de>
14
15 ---
16 fs/nfs/super.c | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
18
19 --- linux-2.6.27-SLE11_BRANCH.orig/fs/nfs/super.c
20 +++ linux-2.6.27-SLE11_BRANCH/fs/nfs/super.c
21 @@ -1536,8 +1536,8 @@ static int nfs_validate_mount_data(void
22 goto out_no_data;
23
24 args->flags = (NFS_MOUNT_VER3 | NFS_MOUNT_TCP);
25 - args->rsize = NFS_MAX_FILE_IO_SIZE;
26 - args->wsize = NFS_MAX_FILE_IO_SIZE;
27 + args->rsize = 0;
28 + args->wsize = 0;
29 args->acregmin = NFS_DEF_ACREGMIN;
30 args->acregmax = NFS_DEF_ACREGMAX;
31 args->acdirmin = NFS_DEF_ACDIRMIN;