removed unneeded files
This commit is contained in:
Steve Dickson
parent
2038fc4964
commit
4e0b786721
@ -1,53 +0,0 @@
|
|||||||
commit efbda485ff5b3d5916971e1af656d2c21307af30
|
|
||||||
Author: Steve Dickson <steved@redhat.com>
|
|
||||||
Date: Sat Nov 3 09:14:57 2007 -0400
|
|
||||||
|
|
||||||
The wording in the exportfs man page can be a bit confusing, implying
|
|
||||||
that "exportfs -u :/foo" will unexport /foo from all hosts, which it won't.
|
|
||||||
|
|
||||||
This patch cleans that wording up and adds a couple examples on how to
|
|
||||||
unexport directories
|
|
||||||
|
|
||||||
Signed-off-by: Steinar H. Gunderson <sesse@debian.org>
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff -up nfs-utils-1.1.1/utils/exportfs/exportfs.man.orig nfs-utils-1.1.1/utils/exportfs/exportfs.man
|
|
||||||
--- nfs-utils-1.1.1/utils/exportfs/exportfs.man.orig 2008-01-22 13:02:18.000000000 -0500
|
|
||||||
+++ nfs-utils-1.1.1/utils/exportfs/exportfs.man 2008-01-22 13:11:52.000000000 -0500
|
|
||||||
@@ -167,11 +167,13 @@ all entries listed in
|
|
||||||
are removed from the kernel export tables, and the file is cleared. This
|
|
||||||
effectively shuts down all NFS activity.
|
|
||||||
.P
|
|
||||||
-To remove individual export entries, one can specify a
|
|
||||||
+To remove individual export entries, specify a
|
|
||||||
.I host:/path
|
|
||||||
pair. This deletes the specified entry from
|
|
||||||
.B etab
|
|
||||||
and removes the corresponding kernel entry (if any).
|
|
||||||
+To remove one or more exports to several hosts, use
|
|
||||||
+.BR "exportfs -ua" .
|
|
||||||
.P
|
|
||||||
.\" -------------------- Dumping the Export Table -----------------
|
|
||||||
.SS Dumping the Export Table
|
|
||||||
@@ -202,6 +204,21 @@ allowing asynchronous writes, one would
|
|
||||||
.nf
|
|
||||||
.B "# exportfs -o async django:/usr/tmp
|
|
||||||
.fi
|
|
||||||
+.P
|
|
||||||
+To unexport the
|
|
||||||
+.B /usr/tmp
|
|
||||||
+directory:
|
|
||||||
+.P
|
|
||||||
+.nf
|
|
||||||
+.B "# exportfs -u django:/usr/tmp
|
|
||||||
+.fi
|
|
||||||
+.P
|
|
||||||
+To unexport all the directories listed in
|
|
||||||
+.B /etc/exports:
|
|
||||||
+.P
|
|
||||||
+.nf
|
|
||||||
+.B "# exportfs -au
|
|
||||||
+.fi
|
|
||||||
.\" -------------------- DEPENDENCIES -----------------------------
|
|
||||||
.SH DEPENDENCIES
|
|
||||||
Exporting to IP networks, DNS and NIS domains does not enable clients
|
|
||||||
@ -1,73 +0,0 @@
|
|||||||
diff -up nfs-utils-1.1.1/utils/mountd/cache.c.orig nfs-utils-1.1.1/utils/mountd/cache.c
|
|
||||||
--- nfs-utils-1.1.1/utils/mountd/cache.c.orig 2007-10-18 23:07:28.000000000 -0400
|
|
||||||
+++ nfs-utils-1.1.1/utils/mountd/cache.c 2008-01-07 14:05:16.000000000 -0500
|
|
||||||
@@ -81,6 +81,8 @@ void auth_unix_ip(FILE *f)
|
|
||||||
if (readline(fileno(f), &lbuf, &lbuflen) != 1)
|
|
||||||
return;
|
|
||||||
|
|
||||||
+ xlog(D_CALL, "auth_unix_ip: inbuf '%s'", lbuf);
|
|
||||||
+
|
|
||||||
cp = lbuf;
|
|
||||||
|
|
||||||
if (qword_get(&cp, class, 20) <= 0 ||
|
|
||||||
@@ -109,6 +111,7 @@ void auth_unix_ip(FILE *f)
|
|
||||||
else if (client)
|
|
||||||
qword_print(f, *client?client:"DEFAULT");
|
|
||||||
qword_eol(f);
|
|
||||||
+ xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, *client?client: "DEFAULT");
|
|
||||||
|
|
||||||
if (client) free(client);
|
|
||||||
free(he);
|
|
||||||
@@ -282,8 +285,10 @@ void nfsd_fh(FILE *f)
|
|
||||||
if (readline(fileno(f), &lbuf, &lbuflen) != 1)
|
|
||||||
return;
|
|
||||||
|
|
||||||
- cp = lbuf;
|
|
||||||
+ xlog(D_CALL, "nfsd_fh: inbuf '%s'", lbuf);
|
|
||||||
|
|
||||||
+ cp = lbuf;
|
|
||||||
+
|
|
||||||
dom = malloc(strlen(cp));
|
|
||||||
if (dom == NULL)
|
|
||||||
return;
|
|
||||||
@@ -514,6 +519,7 @@ void nfsd_fh(FILE *f)
|
|
||||||
free(found_path);
|
|
||||||
free(he);
|
|
||||||
free(dom);
|
|
||||||
+ xlog(D_CALL, "nfsd_fh: found %p path %s", found, found ? found->e_path : NULL);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -607,6 +613,8 @@ void nfsd_export(FILE *f)
|
|
||||||
if (readline(fileno(f), &lbuf, &lbuflen) != 1)
|
|
||||||
return;
|
|
||||||
|
|
||||||
+ xlog(D_CALL, "nfsd_export: inbuf '%s'", lbuf);
|
|
||||||
+
|
|
||||||
cp = lbuf;
|
|
||||||
dom = malloc(strlen(cp));
|
|
||||||
path = malloc(strlen(cp));
|
|
||||||
@@ -686,6 +694,7 @@ void nfsd_export(FILE *f)
|
|
||||||
dump_to_cache(f, dom, path, NULL);
|
|
||||||
}
|
|
||||||
out:
|
|
||||||
+ xlog(D_CALL, "nfsd_export: found %p path %s", found, path ? path : NULL);
|
|
||||||
if (dom) free(dom);
|
|
||||||
if (path) free(path);
|
|
||||||
if (he) free(he);
|
|
||||||
diff -up nfs-utils-1.1.1/support/nfs/exports.c.orig nfs-utils-1.1.1/support/nfs/exports.c
|
|
||||||
--- nfs-utils-1.1.1/support/nfs/exports.c.orig 2008-01-07 14:03:36.000000000 -0500
|
|
||||||
+++ nfs-utils-1.1.1/support/nfs/exports.c 2008-01-07 14:05:16.000000000 -0500
|
|
||||||
@@ -641,6 +641,12 @@ bad_option:
|
|
||||||
while (isblank(*cp))
|
|
||||||
cp++;
|
|
||||||
}
|
|
||||||
+ /*
|
|
||||||
+ * Turn on nohide which will allow this export to cross over
|
|
||||||
+ * the 'mount --bind' mount point.
|
|
||||||
+ */
|
|
||||||
+ if (ep->e_fslocdata)
|
|
||||||
+ ep->e_flags |= NFSEXP_NOHIDE;
|
|
||||||
|
|
||||||
for (p = ep->e_secinfo; p->flav; p++)
|
|
||||||
p->flags |= ep->e_flags & ~NFSEXP_SECINFO_FLAGS;
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
commit 46d439b17f22216ce8f9257a982c6ade5d1c5931
|
|
||||||
Author: Vince Busam <vbusam@google.com>
|
|
||||||
Date: Tue Feb 26 13:04:52 2008 -0500
|
|
||||||
|
|
||||||
Stop gssd from ignoring the machine credential cache
|
|
||||||
defined by the -d flag
|
|
||||||
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
|
|
||||||
|
|
||||||
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
|
|
||||||
index bf8690e..3cf27ca 100644
|
|
||||||
--- a/utils/gssd/krb5_util.c
|
|
||||||
+++ b/utils/gssd/krb5_util.c
|
|
||||||
@@ -404,7 +404,7 @@ gssd_get_single_krb5_cred(krb5_context context,
|
|
||||||
cache_type = "FILE";
|
|
||||||
snprintf(cc_name, sizeof(cc_name), "%s:%s/%s%s_%s",
|
|
||||||
cache_type,
|
|
||||||
- GSSD_DEFAULT_CRED_DIR, GSSD_DEFAULT_CRED_PREFIX,
|
|
||||||
+ ccachedir, GSSD_DEFAULT_CRED_PREFIX,
|
|
||||||
GSSD_DEFAULT_MACHINE_CRED_SUFFIX, ple->realm);
|
|
||||||
ple->endtime = my_creds.times.endtime;
|
|
||||||
if (ple->ccname != NULL)
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
commit bcd0fcaf0966c546da5043be700587f73174ae25
|
|
||||||
Author: NeilBrown <neilb@suse.de>
|
|
||||||
Date: Tue Feb 26 13:57:39 2008 -0500
|
|
||||||
|
|
||||||
If validateascii is passed a string containing only non-zero 7bit
|
|
||||||
values, then the loop with exit with i == len, and the following
|
|
||||||
test will access beyond the end of the array.
|
|
||||||
|
|
||||||
So add an extra test to fix this.
|
|
||||||
|
|
||||||
Found by Marcus Meissner <meissner@novell.com>.
|
|
||||||
|
|
||||||
Signed-off-by: NeilBrown <neilb@suse.de>
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
|
|
||||||
index 355c6e1..6b5971c 100644
|
|
||||||
--- a/utils/idmapd/idmapd.c
|
|
||||||
+++ b/utils/idmapd/idmapd.c
|
|
||||||
@@ -848,7 +848,7 @@ validateascii(char *string, u_int32_t len)
|
|
||||||
return (-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (string[i] != '\0')
|
|
||||||
+ if ((i >= len) || string[i] != '\0')
|
|
||||||
return (-1);
|
|
||||||
|
|
||||||
return (i + 1);
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
commit b5651e42cedc2b91aba87ea30520884d7f43b36f
|
|
||||||
Author: Steve Dickson <steved@redhat.com>
|
|
||||||
Date: Thu Jan 24 17:02:08 2008 -0500
|
|
||||||
|
|
||||||
Added in relatime mount option so mount.nfs stays
|
|
||||||
compatible with the mount command in util-linux-ng
|
|
||||||
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff -up nfs-utils-1.1.1/utils/mount/mount.c.orig nfs-utils-1.1.1/utils/mount/mount.c
|
|
||||||
--- nfs-utils-1.1.1/utils/mount/mount.c.orig 2007-10-18 23:07:28.000000000 -0400
|
|
||||||
+++ nfs-utils-1.1.1/utils/mount/mount.c 2008-01-24 16:46:03.000000000 -0500
|
|
||||||
@@ -130,6 +130,12 @@ static const struct opt_map opt_map[] =
|
|
||||||
{ "diratime", 0, 1, MS_NODIRATIME }, /* Update dir access times */
|
|
||||||
{ "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */
|
|
||||||
#endif
|
|
||||||
+#ifdef MS_RELATIME
|
|
||||||
+ { "relatime", 0, 0, MS_RELATIME }, /* Update access times relative to
|
|
||||||
+ mtime/ctime */
|
|
||||||
+ { "norelatime", 0, 1, MS_RELATIME }, /* Update access time without regard
|
|
||||||
+ to mtime/ctime */
|
|
||||||
+#endif
|
|
||||||
{ NULL, 0, 0, 0 }
|
|
||||||
};
|
|
||||||
|
|
||||||
diff -up nfs-utils-1.1.1/utils/mount/mount_constants.h.orig nfs-utils-1.1.1/utils/mount/mount_constants.h
|
|
||||||
--- nfs-utils-1.1.1/utils/mount/mount_constants.h.orig 2007-10-18 23:07:28.000000000 -0400
|
|
||||||
+++ nfs-utils-1.1.1/utils/mount/mount_constants.h 2008-01-24 16:47:07.000000000 -0500
|
|
||||||
@@ -39,7 +39,10 @@ if we have a stack or plain mount - moun
|
|
||||||
#ifndef MS_VERBOSE
|
|
||||||
#define MS_VERBOSE 0x8000 /* 32768 */
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
+#ifndef MS_RELATIME
|
|
||||||
+#define MS_RELATIME 0x200000 /* 200000: Update access times relative
|
|
||||||
+ to mtime/ctime */
|
|
||||||
+#endif
|
|
||||||
/*
|
|
||||||
* NFS fs-specific mount option flags
|
|
||||||
*
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
commit 72ada109b86622db8009e774ebc96a7a92094e8a
|
|
||||||
Author: Steve Dickson <steved@redhat.com>
|
|
||||||
Date: Wed Jan 16 12:01:13 2008 -0500
|
|
||||||
|
|
||||||
The kernel doesn't support the underlying parts needed for changing the
|
|
||||||
MNT program number.
|
|
||||||
|
|
||||||
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff -up nfs-utils-1.1.1/utils/mount/stropts.c.orig nfs-utils-1.1.1/utils/mount/stropts.c
|
|
||||||
--- nfs-utils-1.1.1/utils/mount/stropts.c.orig 2008-01-22 14:04:16.000000000 -0500
|
|
||||||
+++ nfs-utils-1.1.1/utils/mount/stropts.c 2008-01-22 14:09:54.000000000 -0500
|
|
||||||
@@ -304,9 +304,6 @@ static struct mount_options *rewrite_mou
|
|
||||||
if (option)
|
|
||||||
mnt_server.pmap.pm_port = atoi(option);
|
|
||||||
mnt_server.pmap.pm_prog = MOUNTPROG;
|
|
||||||
- option = po_get(options, "mountprog");
|
|
||||||
- if (option)
|
|
||||||
- mnt_server.pmap.pm_prog = atoi(option);
|
|
||||||
option = po_get(options, "mountvers");
|
|
||||||
if (option)
|
|
||||||
mnt_server.pmap.pm_vers = atoi(option);
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
commit 72bc295da78bafff92762b8afbb298ac16d1ff43
|
|
||||||
Author: Steve Dickson <steved@redhat.com>
|
|
||||||
Date: Wed Jan 16 12:00:32 2008 -0500
|
|
||||||
|
|
||||||
The kernel hasn't supported the underlying parts needed for changing the
|
|
||||||
NFS program number for a very long time.
|
|
||||||
|
|
||||||
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff -up nfs-utils-1.1.1/utils/mount/stropts.c.orig nfs-utils-1.1.1/utils/mount/stropts.c
|
|
||||||
--- nfs-utils-1.1.1/utils/mount/stropts.c.orig 2007-10-18 23:07:28.000000000 -0400
|
|
||||||
+++ nfs-utils-1.1.1/utils/mount/stropts.c 2008-01-22 14:02:51.000000000 -0500
|
|
||||||
@@ -317,9 +317,6 @@ static struct mount_options *rewrite_mou
|
|
||||||
po_remove_all(options, "port");
|
|
||||||
}
|
|
||||||
nfs_server.pmap.pm_prog = NFS_PROGRAM;
|
|
||||||
- option = po_get(options, "nfsprog");
|
|
||||||
- if (option)
|
|
||||||
- nfs_server.pmap.pm_prog = atoi(option);
|
|
||||||
|
|
||||||
option = po_get(options, "nfsvers");
|
|
||||||
if (option) {
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
commit 7a817c45eaeb6aa93fdb5ca4d81c363b4e4218f0
|
|
||||||
Author: Frank Filz <ffilzlnx@us.ibm.com>
|
|
||||||
Date: Sat Feb 9 07:48:48 2008 -0500
|
|
||||||
|
|
||||||
Cleaned up some typos that were found in the various
|
|
||||||
places in the mountd code.
|
|
||||||
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
Signed-off-by: Frank Filz <ffilzlnx@us.ibm.com>
|
|
||||||
|
|
||||||
diff -up nfs-utils-1.1.1/utils/mountd/cache.c.orig nfs-utils-1.1.1/utils/mountd/cache.c
|
|
||||||
--- nfs-utils-1.1.1/utils/mountd/cache.c.orig 2008-02-09 09:52:40.000000000 -0500
|
|
||||||
+++ nfs-utils-1.1.1/utils/mountd/cache.c 2008-02-09 09:53:45.000000000 -0500
|
|
||||||
@@ -111,7 +111,7 @@ void auth_unix_ip(FILE *f)
|
|
||||||
else if (client)
|
|
||||||
qword_print(f, *client?client:"DEFAULT");
|
|
||||||
qword_eol(f);
|
|
||||||
- xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, *client?client: "DEFAULT");
|
|
||||||
+ xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client: "DEFAULT");
|
|
||||||
|
|
||||||
if (client) free(client);
|
|
||||||
free(he);
|
|
||||||
@@ -516,8 +516,10 @@ void nfsd_fh(FILE *f)
|
|
||||||
qword_print(f, found->e_path);
|
|
||||||
qword_eol(f);
|
|
||||||
out:
|
|
||||||
- free(found_path);
|
|
||||||
- free(he);
|
|
||||||
+ if (found_path)
|
|
||||||
+ free(found_path);
|
|
||||||
+ if (he)
|
|
||||||
+ free(he);
|
|
||||||
free(dom);
|
|
||||||
xlog(D_CALL, "nfsd_fh: found %p path %s", found, found ? found->e_path : NULL);
|
|
||||||
return;
|
|
||||||
@@ -667,9 +669,9 @@ void nfsd_export(FILE *f)
|
|
||||||
}
|
|
||||||
/* If one is a CROSSMOUNT, then prefer the longest path */
|
|
||||||
if (((found->m_export.e_flags & NFSEXP_CROSSMOUNT) ||
|
|
||||||
- (found->m_export.e_flags & NFSEXP_CROSSMOUNT)) &&
|
|
||||||
+ (exp->m_export.e_flags & NFSEXP_CROSSMOUNT)) &&
|
|
||||||
strlen(found->m_export.e_path) !=
|
|
||||||
- strlen(found->m_export.e_path)) {
|
|
||||||
+ strlen(exp->m_export.e_path)) {
|
|
||||||
|
|
||||||
if (strlen(exp->m_export.e_path) >
|
|
||||||
strlen(found->m_export.e_path)) {
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
commit 2d77e3a27b7b211f303fcc3a813a044838dad970
|
|
||||||
Author: Steve Dickson <steved@redhat.com>
|
|
||||||
Date: Sat Jan 19 07:59:26 2008 -0500
|
|
||||||
|
|
||||||
Fix bug when both crossmnt and fsid are set.
|
|
||||||
|
|
||||||
When exported a filesystems with option inherited (by the crossmnt
|
|
||||||
option) from a higherlevel filesystem, ignore filesystem specific
|
|
||||||
options like FSID and explicit UUID.
|
|
||||||
|
|
||||||
Signed-off-by: NeilBrown <neilb@suse.de>
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff -up nfs-utils-1.1.1/utils/mountd/cache.c.orig nfs-utils-1.1.1/utils/mountd/cache.c
|
|
||||||
--- nfs-utils-1.1.1/utils/mountd/cache.c.orig 2008-01-22 14:15:12.000000000 -0500
|
|
||||||
+++ nfs-utils-1.1.1/utils/mountd/cache.c 2008-01-22 14:16:48.000000000 -0500
|
|
||||||
@@ -571,20 +571,25 @@ static int dump_to_cache(FILE *f, char *
|
|
||||||
qword_print(f, path);
|
|
||||||
qword_printint(f, time(0)+30*60);
|
|
||||||
if (exp) {
|
|
||||||
- qword_printint(f, exp->e_flags);
|
|
||||||
+ int different_fs = strcmp(path, exp->e_path) != 0;
|
|
||||||
+
|
|
||||||
+ if (different_fs)
|
|
||||||
+ qword_printint(f, exp->e_flags & ~NFSEXP_FSID);
|
|
||||||
+ else
|
|
||||||
+ qword_printint(f, exp->e_flags);
|
|
||||||
qword_printint(f, exp->e_anonuid);
|
|
||||||
qword_printint(f, exp->e_anongid);
|
|
||||||
qword_printint(f, exp->e_fsid);
|
|
||||||
write_fsloc(f, exp, path);
|
|
||||||
write_secinfo(f, exp);
|
|
||||||
#if USE_BLKID
|
|
||||||
- if (exp->e_uuid == NULL) {
|
|
||||||
+ if (exp->e_uuid == NULL || different_fs) {
|
|
||||||
char u[16];
|
|
||||||
if (get_uuid(path, NULL, 16, u)) {
|
|
||||||
qword_print(f, "uuid");
|
|
||||||
qword_printhex(f, u, 16);
|
|
||||||
}
|
|
||||||
- } else if (exp->e_uuid) {
|
|
||||||
+ } else {
|
|
||||||
qword_print(f, "uuid");
|
|
||||||
qword_printhex(f, exp->e_uuid, 16);
|
|
||||||
}
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
commit 9dd9b68c4c44f0d9102eb85ee2fa36a8b7f638e3
|
|
||||||
Author: Harshula Jayasuriya <harshula@sgi.com>
|
|
||||||
Date: Tue Feb 12 16:13:25 2008 -0500
|
|
||||||
|
|
||||||
In mountd, if get_exportlist() (utils/mountd/mountd.c) returns NULL it
|
|
||||||
should not be considered a failure. It just means that there are no
|
|
||||||
exports on the system.
|
|
||||||
|
|
||||||
The practical problem with the current code is that a showmount -e
|
|
||||||
results in a syslog message from mountd that looks like:
|
|
||||||
|
|
||||||
rpc.mountd: export request from 10.250.100.2 failed.
|
|
||||||
|
|
||||||
Reviewed-by: Greg Banks <gnb@sgi.com>
|
|
||||||
Signed-off-by: Harshula Jayasuriya <harshula@sgi.com>
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
|
|
||||||
index 4a50588..63d5ce1 100644
|
|
||||||
--- a/utils/mountd/mountd.c
|
|
||||||
+++ b/utils/mountd/mountd.c
|
|
||||||
@@ -203,9 +203,8 @@ mount_dump_1_svc(struct svc_req *rqstp, void *argp, mountlist *res)
|
|
||||||
struct sockaddr_in *addr =
|
|
||||||
(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
|
|
||||||
|
|
||||||
- if ((*res = mountlist_list()) == NULL)
|
|
||||||
- xlog(L_WARNING, "dump request from %s failed.",
|
|
||||||
- inet_ntoa(addr->sin_addr));
|
|
||||||
+ xlog(D_CALL, "dump request from %s.", inet_ntoa(addr->sin_addr));
|
|
||||||
+ *res = mountlist_list();
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
@@ -254,9 +253,8 @@ mount_export_1_svc(struct svc_req *rqstp, void *argp, exports *resp)
|
|
||||||
struct sockaddr_in *addr =
|
|
||||||
(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
|
|
||||||
|
|
||||||
- if ((*resp = get_exportlist()) == NULL)
|
|
||||||
- xlog(L_WARNING, "export request from %s failed.",
|
|
||||||
- inet_ntoa(addr->sin_addr));
|
|
||||||
+ xlog(D_CALL, "export request from %s.", inet_ntoa(addr->sin_addr));
|
|
||||||
+ *resp = get_exportlist();
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
@@ -267,9 +265,9 @@ mount_exportall_1_svc(struct svc_req *rqstp, void *argp, exports *resp)
|
|
||||||
struct sockaddr_in *addr =
|
|
||||||
(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
|
|
||||||
|
|
||||||
- if ((*resp = get_exportlist()) == NULL)
|
|
||||||
- xlog(L_WARNING, "exportall request from %s failed.",
|
|
||||||
- inet_ntoa(addr->sin_addr));
|
|
||||||
+ xlog(D_CALL, "exportall request from %s.", inet_ntoa(addr->sin_addr));
|
|
||||||
+ *resp = get_exportlist();
|
|
||||||
+
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
commit 7c6a4ae0aff5c2cd5fde2909e8af886ccf0bd27d
|
|
||||||
Author: Steve Dickson <steved@dickson.boston.devel.redhat.com>
|
|
||||||
Date: Mon Jan 7 10:39:37 2008 -0500
|
|
||||||
|
|
||||||
Fixed typo in rpc.mountd's man page
|
|
||||||
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff --git a/utils/mountd/mountd.man b/utils/mountd/mountd.man
|
|
||||||
index 4276663..2f42d00 100644
|
|
||||||
--- a/utils/mountd/mountd.man
|
|
||||||
+++ b/utils/mountd/mountd.man
|
|
||||||
@@ -119,7 +119,7 @@ The third will be the path that the client is mounting.
|
|
||||||
The last is the number of concurrent mounts that we believe the client
|
|
||||||
has of that path.
|
|
||||||
.TP
|
|
||||||
-.BI "\-P," "" " \-\-state\-directory\-path " directory
|
|
||||||
+.BI "\-s," "" " \-\-state\-directory\-path " directory
|
|
||||||
specify a directory in which to place statd state information.
|
|
||||||
If this option is not specified the default of
|
|
||||||
.BR /var/lib/nfs
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
commit acf95d32a44fd8357c24e8a04ec53fc6900bfc58
|
|
||||||
Author: Peng Haitao <penght@cn.fujitsu.com>
|
|
||||||
Date: Tue Feb 26 13:52:18 2008 -0500
|
|
||||||
|
|
||||||
Fixed typo in the nfsstat command line arugments.
|
|
||||||
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c
|
|
||||||
index 828119b..ed8cfc8 100644
|
|
||||||
--- a/utils/nfsstat/nfsstat.c
|
|
||||||
+++ b/utils/nfsstat/nfsstat.c
|
|
||||||
@@ -237,7 +237,7 @@ static struct option longopts[] =
|
|
||||||
{ "all", 0, 0, 'v' },
|
|
||||||
{ "auto", 0, 0, '\3' },
|
|
||||||
{ "client", 0, 0, 'c' },
|
|
||||||
- { "mounts", 0, 0, 'm' },
|
|
||||||
+ { "mounted", 0, 0, 'm' },
|
|
||||||
{ "nfs", 0, 0, 'n' },
|
|
||||||
{ "rpc", 0, 0, 'r' },
|
|
||||||
{ "server", 0, 0, 's' },
|
|
||||||
@ -1,49 +0,0 @@
|
|||||||
commit b1e64b99a97b27d850d7a615b291aa9aeb2972ab
|
|
||||||
Author: Steve Dickson <steved@redhat.com>
|
|
||||||
Date: Fri Oct 26 07:57:10 2007 -0400
|
|
||||||
|
|
||||||
Added -S/--since to the nfsstat(1) manpage
|
|
||||||
|
|
||||||
Author: David Richter <richterd@citi.umich.edu>
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff -up nfs-utils-1.1.1/utils/nfsstat/nfsstat.man.orig nfs-utils-1.1.1/utils/nfsstat/nfsstat.man
|
|
||||||
--- nfs-utils-1.1.1/utils/nfsstat/nfsstat.man.orig 2007-10-18 23:07:28.000000000 -0400
|
|
||||||
+++ nfs-utils-1.1.1/utils/nfsstat/nfsstat.man 2008-01-22 12:57:08.000000000 -0500
|
|
||||||
@@ -72,8 +72,27 @@ Display all of the above facilities.
|
|
||||||
.B \-v, \-\-verbose
|
|
||||||
This is equivalent to \fB\-o all\fR.
|
|
||||||
.TP
|
|
||||||
+.BI "\-S, \-\-since " file
|
|
||||||
+Instead of printing current statistics,
|
|
||||||
+.B nfsstat
|
|
||||||
+imports statistics from
|
|
||||||
+.I file
|
|
||||||
+and displays the difference between those and the current statistics.
|
|
||||||
+Valid input
|
|
||||||
+.IR file "s may be in the form of "
|
|
||||||
+.B /proc/net/rpc/nfs
|
|
||||||
+(raw client stats),
|
|
||||||
+.B /proc/net/rpc/nfsd
|
|
||||||
+(raw server stats), or saved output from
|
|
||||||
+.B nfsstat
|
|
||||||
+itself (client and/or server stats). Any statistics missing from a saved
|
|
||||||
+.B nfsstat
|
|
||||||
+output
|
|
||||||
+.I file
|
|
||||||
+are treated as zeroes.
|
|
||||||
+.TP
|
|
||||||
.B \-Z, \-\-sleep
|
|
||||||
-Instead of printing statistics and immediately exiting,
|
|
||||||
+Instead of printing current statistics and immediately exiting,
|
|
||||||
.B nfsstat
|
|
||||||
takes a snapshot of the current statistics and pauses until it receives
|
|
||||||
.B SIGINT
|
|
||||||
@@ -81,6 +100,7 @@ takes a snapshot of the current statisti
|
|
||||||
.BR Ctrl-C ),
|
|
||||||
at which point it takes another snapshot and displays the difference
|
|
||||||
between the two.
|
|
||||||
+.\" --------------------- EXAMPLES -------------------------------
|
|
||||||
.SH EXAMPLES
|
|
||||||
.TP
|
|
||||||
.B nfsstat \-o all \-234
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
commit 399cc3dad0cdfe8dca4a0ae9035a0554d7223eb2
|
|
||||||
Author: Steve Dickson <steved@dickson.boston.devel.redhat.com>
|
|
||||||
Date: Thu Jan 17 11:25:37 2008 -0500
|
|
||||||
|
|
||||||
Stop segfaults on amd64 during warnings messages by creating
|
|
||||||
a second va_list in xlog_backend() and then use that va_list
|
|
||||||
to print messages on stderr.
|
|
||||||
|
|
||||||
Signed-off-by: Steinar H. Gunderson <sesse@debian.org>
|
|
||||||
Signed-off-by: Steve Langasek <vorlon@debian.org>
|
|
||||||
Signed-off-by: Steve Dickson <steved@dickson.boston.devel.redhat.com>
|
|
||||||
|
|
||||||
diff -up nfs-utils-1.1.1/support/nfs/xlog.c.orig nfs-utils-1.1.1/support/nfs/xlog.c
|
|
||||||
--- nfs-utils-1.1.1/support/nfs/xlog.c.orig 2007-10-18 23:07:28.000000000 -0400
|
|
||||||
+++ nfs-utils-1.1.1/support/nfs/xlog.c 2008-01-22 14:13:36.000000000 -0500
|
|
||||||
@@ -133,9 +133,14 @@ xlog_enabled(int fac)
|
|
||||||
void
|
|
||||||
xlog_backend(int kind, const char *fmt, va_list args)
|
|
||||||
{
|
|
||||||
+ va_list args2;
|
|
||||||
+
|
|
||||||
if (!(kind & (L_ALL)) && !(logging && (kind & logmask)))
|
|
||||||
return;
|
|
||||||
|
|
||||||
+ if (log_stderr)
|
|
||||||
+ va_copy(args2, args);
|
|
||||||
+
|
|
||||||
if (log_syslog) {
|
|
||||||
switch (kind) {
|
|
||||||
case L_FATAL:
|
|
||||||
@@ -171,9 +176,9 @@ xlog_backend(int kind, const char *fmt,
|
|
||||||
#else
|
|
||||||
fprintf(stderr, "%s: ", log_name);
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
- vfprintf(stderr, fmt, args);
|
|
||||||
+ vfprintf(stderr, fmt, args2);
|
|
||||||
fprintf(stderr, "\n");
|
|
||||||
+ va_end(args2);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (kind == L_FATAL)
|
|
||||||
Loading…
Reference in New Issue
Block a user