Deleted Added
full compact
nfs.h (51344) nfs.h (51791)
1/*
2 * Copyright (c) 1989, 1993, 1995
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Rick Macklem at The University of Guelph.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 20 unchanged lines hidden (view full) ---

29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
36 * @(#)nfs.h 8.4 (Berkeley) 5/1/95
1/*
2 * Copyright (c) 1989, 1993, 1995
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Rick Macklem at The University of Guelph.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 20 unchanged lines hidden (view full) ---

29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
36 * @(#)nfs.h 8.4 (Berkeley) 5/1/95
37 * $FreeBSD: head/sys/nfsclient/nfs.h 51344 1999-09-17 05:57:57Z dillon $
37 * $FreeBSD: head/sys/nfsclient/nfs.h 51791 1999-09-29 15:03:48Z marcel $
38 */
39
40#ifndef _NFS_NFS_H_
41#define _NFS_NFS_H_
42
43#ifdef KERNEL
44#include "opt_nfs.h"
45#endif

--- 275 unchanged lines hidden (view full) ---

321/*
322 * The set of signals the interrupt an I/O in progress for NFSMNT_INT mounts.
323 * What should be in this set is open to debate, but I believe that since
324 * I/O system calls on ufs are never interrupted by signals the set should
325 * be minimal. My reasoning is that many current programs that use signals
326 * such as SIGALRM will not expect file I/O system calls to be interrupted
327 * by them and break.
328 */
38 */
39
40#ifndef _NFS_NFS_H_
41#define _NFS_NFS_H_
42
43#ifdef KERNEL
44#include "opt_nfs.h"
45#endif

--- 275 unchanged lines hidden (view full) ---

321/*
322 * The set of signals the interrupt an I/O in progress for NFSMNT_INT mounts.
323 * What should be in this set is open to debate, but I believe that since
324 * I/O system calls on ufs are never interrupted by signals the set should
325 * be minimal. My reasoning is that many current programs that use signals
326 * such as SIGALRM will not expect file I/O system calls to be interrupted
327 * by them and break.
328 */
329#define NFSINT_SIGMASK (sigmask(SIGINT)|sigmask(SIGTERM)|sigmask(SIGKILL)| \
330 sigmask(SIGHUP)|sigmask(SIGQUIT))
329#define NFSINT_SIGMASK(set) \
330 (SIGISMEMBER(set, SIGINT) || SIGISMEMBER(set, SIGTERM) || \
331 SIGISMEMBER(set, SIGHUP) || SIGISMEMBER(set, SIGKILL) || \
332 SIGISMEMBER(set, SIGQUIT))
331
332/*
333 * Socket errors ignored for connectionless sockets??
334 * For now, ignore them all
335 */
336#define NFSIGNORE_SOERROR(s, e) \
337 ((e) != EINTR && (e) != ERESTART && (e) != EWOULDBLOCK && \
338 ((s) & PR_CONNREQUIRED) == 0)

--- 397 unchanged lines hidden ---
333
334/*
335 * Socket errors ignored for connectionless sockets??
336 * For now, ignore them all
337 */
338#define NFSIGNORE_SOERROR(s, e) \
339 ((e) != EINTR && (e) != ERESTART && (e) != EWOULDBLOCK && \
340 ((s) & PR_CONNREQUIRED) == 0)

--- 397 unchanged lines hidden ---