diff options
Diffstat (limited to 'nfs')
| -rw-r--r-- | nfs/Makefile | 6 | ||||
| -rw-r--r-- | nfs/mount.c | 4 | ||||
| -rw-r--r-- | nfs/ops.c | 13 | ||||
| -rw-r--r-- | nfs/rpc.c | 2 |
4 files changed, 7 insertions, 18 deletions
diff --git a/nfs/Makefile b/nfs/Makefile index d6b8c9c0..10ca2587 100644 --- a/nfs/Makefile +++ b/nfs/Makefile @@ -1,6 +1,6 @@ # -# Copyright (C) 1995, 1996, 1997, 2000, 2001, 2008 Free Software Foundation, -# Inc. +# Copyright (C) 1995, 1996, 1997, 2000, 2001, 2008, 2011 Free Software +# Foundation, Inc. # # Written by Michael I. Bushnell. # @@ -28,6 +28,6 @@ LCLHDRS = nfs.h mount.h nfs-spec.h SRCS = ops.c rpc.c mount.c nfs.c cache.c consts.c main.c name-cache.c \ storage-info.c OBJS = $(SRCS:.c=.o) -HURDLIBS = netfs fshelp iohelp threads ports shouldbeinlibc +HURDLIBS = netfs fshelp iohelp threads ports ihash shouldbeinlibc include ../Makeconf diff --git a/nfs/mount.c b/nfs/mount.c index 07dbb19b..6120f87a 100644 --- a/nfs/mount.c +++ b/nfs/mount.c @@ -199,7 +199,7 @@ mount_root (char *name, char *host) err = conduct_rpc (&rpcbuf, &p); if (err) { - error (0, err, name); + error (0, err, "%s", name); goto error_with_rpcbuf; } /* XXX Protocol spec says this should be a "unix error code"; we'll @@ -209,7 +209,7 @@ mount_root (char *name, char *host) p++; if (err) { - error (0, err, name); + error (0, err, "%s", name); goto error_with_rpcbuf; } @@ -1,5 +1,5 @@ /* ops.c - Libnetfs callbacks for node operations in NFS client. - Copyright (C) 1994,95,96,97,99,2002 Free Software Foundation, Inc. + Copyright (C) 1994,95,96,97,99,2002,2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -1881,17 +1881,6 @@ netfs_get_dirents (struct iouser *cred, struct node *np, } -/* Implement the netfs_set_translator callback as described in - <hurd/netfs.h>. */ -error_t -netfs_set_translator (struct iouser *cred, - struct node *np, - char *argz, - size_t argzlen) -{ - return EOPNOTSUPP; -} - /* Implement the netfs_attempt_mksymlink callback as described in <hurd/netfs.h>. */ error_t @@ -75,7 +75,7 @@ generate_xid () credential structure with UID, GID, and SECOND_GID; any of these may be -1 to indicate that it does not apply, however, exactly zero or two of UID and GID must be -1. The returned address is a pointer - to the start of the payload. If NULL is returned, an error occured + to the start of the payload. If NULL is returned, an error occurred and the code is set in errno. */ int * initialize_rpc (int program, int version, int rpc_proc, |