nfs-utils 3 of 10 - Make sure check_new_cache() looks in the right place
Subsystems (2)
PATCH 1/1 nfs-utils 3 of 10 - Make sure check_new_cache() looks in the right place
Make sure check_new_cache() is looking in the right place Eliminate 3 syslog message that are logged for successful events.
Signed-off-by Steve Dickson <[email protected]>
---------
support/nfs/cacheio.c renamed from support/nfs/cacheio.c.org +13 -2
@@ -223,12 +223,23 @@ int readline(int fd, char **buf, int *le* This succeeds iff the "nfsd" filesystem is mounted on * /proc/fs/nfs */ +static char *cachelist[] = { + {"auth.unix.ip" }, {"nfsd.export" }, {"nfsd.fh" }, + {NULL ,NULL } +};int check_new_cache (void ) {struct stat stb; -return (stat ("/proc/fs/nfs/filehandle" , &stb) ==0 ) || - (stat ("/proc/fs/nfsd/filehandle" , &stb) ==0 ); +char path[64 ]; +int i; + +for (i=0 ; cachelist[i]; i++ ){ +sprintf (path,"/proc/net/rpc/%s/channel" , cachelist[i]); +if (stat (path, &stb) <0 ) +return 0 ; + } +return 1 ; }
utils/mountd/mountd.c renamed from utils/mountd/mountd.c.org +13 -9
@@ -90,10 +90,11 @@ mount_dump_1_svc(struct svc_req *rqstp, {struct sockaddr_in *addr = (struct sockaddr_in *)svc_getcaller (rqstp->rq_xprt); -xlog (L_NOTICE ,"dump request from %s" , -inet_ntoa (addr->sin_addr)); - *res =mountlist_list (); +if ((*res =mountlist_list ()) ==NULL ) +xlog (L_WARNING ,"dump request from %s failed." , +inet_ntoa (addr->sin_addr)); +return 1 ; }
@@ -143,9 +144,11 @@ mount_export_1_svc(struct svc_req *rqstp {struct sockaddr_in *addr = (struct sockaddr_in *)svc_getcaller (rqstp->rq_xprt); -xlog (L_NOTICE ,"export request from %s" , -inet_ntoa (addr->sin_addr)); - *resp =get_exportlist (); + +if ((*resp =get_exportlist ()) ==NULL ) +xlog (L_WARNING ,"export request from %s failed." , +inet_ntoa (addr->sin_addr)); +return 1 ; }
@@ -154,9 +157,10 @@ mount_exportall_1_svc(struct svc_req *rq {struct sockaddr_in *addr = (struct sockaddr_in *)svc_getcaller (rqstp->rq_xprt); -xlog (L_NOTICE ,"exportall request from %s" , -inet_ntoa (addr->sin_addr)); - *resp =get_exportlist (); + +if ((*resp =get_exportlist ()) ==NULL ) +xlog (L_WARNING ,"exportall request from %s failed." , +inet_ntoa (addr->sin_addr));return 1 ; }