#endif
#ifdef RECALC_SIGPENDING_TAKES_VOID
-/* Principal of maximum uselessness says we need to provide this */
-static inline int _has_pending_signals(sigset_t *signal, sigset_t *blocked)
-{
- unsigned long ready;
- long i;
-
- switch (_NSIG_WORDS) {
- default:
- for (i = _NSIG_WORDS, ready = 0; --i >= 0 ;)
- ready |= signal->sig[i] &~ blocked->sig[i];
- break;
-
- case 4: ready = signal->sig[3] &~ blocked->sig[3];
- ready |= signal->sig[2] &~ blocked->sig[2];
- ready |= signal->sig[1] &~ blocked->sig[1];
- ready |= signal->sig[0] &~ blocked->sig[0];
- break;
-
- case 2: ready = signal->sig[1] &~ blocked->sig[1];
- ready |= signal->sig[0] &~ blocked->sig[0];
- break;
-
- case 1: ready = signal->sig[0] &~ blocked->sig[0];
- }
- return ready != 0;
-}
-
-#define PENDING(p,b) _has_pending_signals(&(p)->signal, (b))
-static inline void _recalc_sigpending_tsk(struct task_struct *t)
-{
- t->sigpending = PENDING(&t->pending, &t->blocked) ||
-#ifdef STRUCT_TASK_STRUCT_HAS_SIG
- PENDING(&t->sig->shared_pending, &t->blocked);
-#else
- PENDING(&t->signal->shared_pending, &t->blocked);
-#endif
-}
-
-#define RECALC_SIGPENDING(X) _recalc_sigpending_tsk(X)
+#define RECALC_SIGPENDING(X) recalc_sigpending()
#else
#define RECALC_SIGPENDING(X) recalc_sigpending(X)
#endif
-
+
#if defined (STRUCT_TASK_STRUCT_HAS_SIGMASK_LOCK)
#define SIG_LOCK(X) spin_lock_irq(&X->sigmask_lock)
#define SIG_UNLOCK(X) spin_unlock_irq(&X->sigmask_lock)
#define afs_hz HZ
#include "h/sched.h"
#define osi_Time() (xtime.tv_sec)
-#if (CPU == sparc64)
-#define osi_GetTime(V) do { (*(V)).tv_sec = xtime.tv_sec; (*(V)).tv_usec = xtime.tv_usec; } while (0)
-#else
-#define osi_GetTime(V) (*(V)=xtime)
-#endif
+#define osi_GetTime(V) do_gettimeofday((V))
#undef gop_lookupname
#define gop_lookupname osi_lookupname
-#define osi_vnhold(v, n) VN_HOLD(v)
+#define osi_vnhold(v, n) do { VN_HOLD(AFSTOV(v)); } while (0)
+
+#if defined(AFS_LINUX24_ENV)
+#define VN_HOLD(V) atomic_inc(&((vnode_t *) V)->i_count)
+#else
+#define VN_HOLD(V) ((vnode_t *) V)->i_count++
+#endif
+
+#if defined(AFS_LINUX26_ENV)
+#define VN_RELE(V) iput((struct inode *) V)
+#else
+#define VN_RELE(V) osi_iput((struct inode *) V)
+#endif
#define osi_AllocSmall afs_osi_Alloc
#define osi_FreeSmall afs_osi_Free
-#define afs_suser suser
+#define afs_suser(x) capable(CAP_SYS_ADMIN)
#define wakeup afs_osi_Wakeup
#undef vType
* Use the same type of test as other OS's for compatibility.
*/
#undef IsAfsVnode
-extern struct vnodeops afs_dir_iops, afs_symlink_iops;
-#define IsAfsVnode(vc) (((vc)->v_op == afs_ops) ? 1 : \
- ((vc)->v_op == &afs_dir_iops) ? 1 : \
- ((vc)->v_op == &afs_symlink_iops))
-
-#if 0
-/* bcopy is in stds.h, just so fcrypt.c can pick it up. */
-#define bzero(D,C) memset((D), 0, (C))
-#define bcmp(A,B,C) memcmp((A), (B), (C))
-#endif
+extern struct vnodeops afs_file_iops, afs_dir_iops, afs_symlink_iops;
+#define IsAfsVnode(v) (((v)->v_op == &afs_file_iops) ? 1 : \
+ ((v)->v_op == &afs_dir_iops) ? 1 : \
+ ((v)->v_op == &afs_symlink_iops))
+#undef SetAfsVnode
+#define SetAfsVnode(v)
/* We often need to pretend we're in user space to get memory transfers
* right for the kernel calls we use.
#define PAGESIZE PAGE_SIZE
+#ifndef NGROUPS
+#define NGROUPS NGROUPS_SMALL
+#endif
/* cred struct */
typedef struct cred { /* maps to task field: */
#else
int cr_ref;
#endif
- uid_t cr_uid; /* euid */
- uid_t cr_ruid; /* uid */
- gid_t cr_gid; /* egid */
- gid_t cr_rgid; /* gid */
+ uid_t cr_uid; /* euid */
+ uid_t cr_ruid; /* uid */
+ gid_t cr_gid; /* egid */
+ gid_t cr_rgid; /* gid */
+#if defined(AFS_LINUX26_ENV)
+ struct group_info *cr_group_info;
+#else
gid_t cr_groups[NGROUPS]; /* 32 groups - empty set to NOGROUP */
int cr_ngroups;
+#endif
} cred_t;
#define AFS_UCRED cred
#define AFS_PROC struct task_struct
typedef enum { AFS_UIOSYS, AFS_UIOUSER } uio_seg_t;
typedef enum { UIO_READ, UIO_WRITE } uio_flag_t;
typedef struct uio {
- struct iovec *uio_iov;
- int uio_iovcnt;
- afs_offs_t uio_offset;
- uio_seg_t uio_seg;
- int uio_resid;
- uio_flag_t uio_flag;
+ struct iovec *uio_iov;
+ int uio_iovcnt;
+ afs_offs_t uio_offset;
+ uio_seg_t uio_seg;
+ int uio_resid;
+ uio_flag_t uio_flag;
} uio_t;
#define afsio_iov uio_iov
#define afsio_iovcnt uio_iovcnt
*/
extern unsigned long afs_linux_page_offset;
-/* some more functions to help with the page offset stuff */
-#define AFS_LINUX_MAP_NR(addr) ((((unsigned long)addr) - afs_linux_page_offset) >> PAGE_SHIFT)
-
+/* function to help with the page offset stuff */
#define afs_linux_page_address(page) (afs_linux_page_offset + PAGE_SIZE * (page - mem_map))
#if defined(__KERNEL__) && defined(CONFIG_SMP)
git://git.openafs.org / openafs.git / blobdiff