search for: nfs_mount_ver3

...4-02-12 03:19:14.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

...9,6 +132,22 @@ static void parse_opts(char *opts) } } } + /* If new-style options "nfsvers=" or "vers=" are passed, override + old "v2" and "v3" options */ + if (nfs_version != 0) { + switch (nfs_version) { + case 2: + mount_data.flags &= ~NFS_MOUNT_VER3; + break; + case 3: + mount_data.flags |= NFS_MOUNT_VER3; + break; + default: + fprintf(stderr, "%s: bad NFS version '%d'\n", + progname, nfs_version); + longjmp(abort_buf, 1); + } + } } static uint32_t parse_addr(const char *ip) -- 2.11.0

...9,6 +132,22 @@ static void parse_opts(char *opts) } } } + /* If new-style options "nfsvers=" or "vers=" are passed, override + old "v2" and "v3" options */ + if (nfs_version != 0) { + switch (nfs_version) { + case 2: + mount_data.flags &= ~NFS_MOUNT_VER3; + break; + case 3: + mount_data.flags |= NFS_MOUNT_VER3; + break; + default: + fprintf(stderr, "%s: bad NFS version '%d'\n", + progname, nfs_version); + longjmp(abort_buf, 1); + } + } } static uint32_t parse_addr(const char *ip)

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

...&= ~NFS_MOUNT_NOAC; - break; - case Opt_noac: - nfs_data.flags |= NFS_MOUNT_NOAC; - break; - case Opt_lock: - nfs_data.flags &= ~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; -...

...file changed, 1 insertion(+), 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,

...(-) diff --git a/usr/kinit/nfsmount/mount.c b/usr/kinit/nfsmount/mount.c index e3838f4..e0687a6 100644 --- a/usr/kinit/nfsmount/mount.c +++ b/usr/kinit/nfsmount/mount.c @@ -329,9 +329,9 @@ int nfs_mount(const char *pathname, const char *hostname, bail: if (mounted) { if (data->flags & NFS_MOUNT_VER3) - umount_v3(path, clnt); + umount_v3(rem_path, clnt); else - umount_v2(path, clnt); + umount_v2(rem_path, clnt); } ret = -1;

...nt.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 */ +#define NFS_MOUNT_FLAGMASK 0xFFFF extern _...

...(-) diff --git a/usr/kinit/nfsmount/mount.c b/usr/kinit/nfsmount/mount.c index e3838f4..e0687a6 100644 --- a/usr/kinit/nfsmount/mount.c +++ b/usr/kinit/nfsmount/mount.c @@ -329,9 +329,9 @@ int nfs_mount(const char *pathname, const char *hostname, bail: if (mounted) { if (data->flags & NFS_MOUNT_VER3) - umount_v3(path, clnt); + umount_v3(rem_path, clnt); else - umount_v2(path, clnt); + umount_v2(rem_path, clnt); } ret = -1; -- Benjamin Cama <benjamin.cama at telecom-bretagne.eu>

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:

...nocto", ~NFS_MOUNT_NOCTO, NFS_MOUNT_NOCTO }, - { "ac", ~NFS_MOUNT_NOAC, 0 }, - { "noac", ~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 addres...