search for: nfs_mount_tcp

...000000000 +0100 +++ nfsmount/main.c 2004-05-27 13:31:19.000000000 +0200 @@ -20,9 +20,9 @@ static char *progname; static struct nfs_mount_data mount_data = { .version = NFS_MOUNT_VERSION, - .flags = NFS_MOUNT_NONLM, - .rsize = 1024, - .wsize = 1024, + .flags = NFS_MOUNT_NONLM | NFS_MOUNT_VER3 | NFS_MOUNT_TCP, + .rsize = 8192, + .wsize = 8192, .timeo = 7, .retrans = 3, .acregmin = 3, -- USB is for mice, FireWire is for men! sUse lINUX ag, n?RNBERG

Various coding style fixes checkpatch warns about. The goal is not to be 100% checkpatch compliant, but to have more consistent coding style. As this is a trivial patch serie, will land in 24 hours in klibc git, unless of course ml review hits a bugger. Checked with size(3) that the generated kinit, fstype, ipconfig and nfsmount are the same. maximilian attems (4): [klibc] ipconfig: reduce

...gs &= ~NFS_MOUNT_NONLM; - break; - case Opt_nolock: - nfs_data.flags |= NFS_MOUNT_NONLM; - break; - case Opt_v2: - nfs_data.flags &= ~NFS_MOUNT_VER3; - break; - case Opt_v3: - nfs_data.flags |= NFS_MOUNT_VER3; - break; - case Opt_udp: - nfs_data.flags &= ~NFS_MOUNT_TCP; - break; - case Opt_tcp: - nfs_data.flags |= NFS_MOUNT_TCP; - break; - case Opt_acl: - nfs_data.flags &= ~NFS_MOUNT_NOACL; - break; - case Opt_noacl: - nfs_data.flags |= NFS_MOUNT_NOACL; - break; - default: - printk(KERN_WARNING "Root-NFS: unknown " -...

...nsertion(+), 1 deletion(-) diff --git a/usr/kinit/nfsmount/main.c b/usr/kinit/nfsmount/main.c index cca9e4ec..66969f42 100644 --- a/usr/kinit/nfsmount/main.c +++ b/usr/kinit/nfsmount/main.c @@ -26,7 +26,7 @@ static struct nfs_mount_data mount_data = { .flags = NFS_MOUNT_NONLM | NFS_MOUNT_VER3 | NFS_MOUNT_TCP, .rsize = 0, /* Server's choice */ .wsize = 0, /* Server's choice */ - .timeo = 7, + .timeo = 0, /* Kernel client's default */ .retrans = 3, .acregmin = 3, .acregmax = 60,

...sock < 0) diff --git a/usr/kinit/nfsmount/mount.c b/usr/kinit/nfsmount/mount.c index a55af91..f18cffa 100644 --- a/usr/kinit/nfsmount/mount.c +++ b/usr/kinit/nfsmount/mount.c @@ -290,9 +290,9 @@ int nfs_mount(const char *pathname, const char *hostname, mounted = 1; if (data->flags & NFS_MOUNT_TCP) { - sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); } else { - sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); } if (sock == -1) { diff --git a/usr/kinit/nfsmount/sunrpc.c b/usr/ki...

...field */ -#include <linux/nfs_mount.h> +#define NFS_MOUNT_SOFT 0x0001 /* 1 */ +#define NFS_MOUNT_INTR 0x0002 /* 1 */ +#define NFS_MOUNT_SECURE 0x0004 /* 1 */ +#define NFS_MOUNT_POSIX 0x0008 /* 1 */ +#define NFS_MOUNT_NOCTO 0x0010 /* 1 */ +#define NFS_MOUNT_NOAC 0x0020 /* 1 */ +#define NFS_MOUNT_TCP 0x0040 /* 2 */ +#define NFS_MOUNT_VER3 0x0080 /* 3 */ +#define NFS_MOUNT_KERBEROS 0x0100 /* 3 */ +#define NFS_MOUNT_NONLM 0x0200 /* 3 */ +#define NFS_MOUNT_BROKEN_SUID 0x0400 /* 4 */ +#define NFS_MOUNT_STRICTLOCK 0x1000 /* reserved for NFSv4 */ +#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ +#defi...

...", ~NFS_MOUNT_NOAC, NFS_MOUNT_NOAC }, - { "lock", ~NFS_MOUNT_NONLM, 0 }, - { "nolock", ~NFS_MOUNT_NONLM, NFS_MOUNT_NONLM }, -#ifdef CONFIG_NFS_V3 - { "v2", ~NFS_MOUNT_VER3, 0 }, - { "v3", ~NFS_MOUNT_VER3, NFS_MOUNT_VER3 }, -#endif - { "udp", ~NFS_MOUNT_TCP, 0 }, - { "tcp", ~NFS_MOUNT_TCP, NFS_MOUNT_TCP }, - { "broken_suid",~NFS_MOUNT_BROKEN_SUID, NFS_MOUNT_BROKEN_SUID }, - { NULL, 0, 0 } -}; - - -/* - * Extract IP address from the parameter string if needed. Note that we - * need to have root_server_addr set _before_ IPConf...

hello hpa, nothing particular stands out, just syncing with latest Debian upload and subsequent patch emails. please review merge or nack. thanks :) maks git pull git://git.debian.org/~maks/klibc.git maks for the changes: Aaron Griffin (1): [klibc] kinit: skip md assembly if mdX exists Colin Watson (1): [klibc] mount/umount FUSE support Harald Jenny (1): [klibc] fstype: