#undef getuerror
#define getpid() current->pid
+#ifdef STRUCT_TASK_STRUCT_HAS_REAL_PARENT
+#define getppid() current->real_parent->pid
+#else
#define getppid() current->p_opptr->pid
+#endif
+
+#ifdef RECALC_SIGPENDING_TAKES_VOID
+#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)
+#elif defined (STRUCT_TASK_STRUCT_HAS_SIGHAND)
+#define SIG_LOCK(X) spin_lock_irq(&X->sighand->siglock)
+#define SIG_UNLOCK(X) spin_unlock_irq(&X->sighand->siglock)
+#else
+#define SIG_LOCK(X) spin_lock_irq(&X->sig->siglock)
+#define SIG_UNLOCK(X) spin_unlock_irq(&X->sig->siglock)
+#endif
+
+#if defined (STRUCT_TASK_STRUCT_HAS_RLIM)
+#define TASK_STRUCT_RLIM rlim
+#elif defined (STRUCT_TASK_STRUCT_HAS_SIGNAL_RLIM)
+#define TASK_STRUCT_RLIM signal->rlim
+#else
+#error Not sure what to do about rlim (should be in the Linux task struct somewhere....)
+#endif
#define afs_hz HZ
-#include "../h/sched.h"
+#include "h/sched.h"
#define osi_Time() (xtime.tv_sec)
-#define osi_GetTime(V) (*(V)=xtime)
+#ifdef AFS_LINUX_64BIT_KERNEL
+#define osi_GetTime(V) \
+ do { \
+ struct timeval __afs_tv; \
+ do_gettimeofday(&__afs_tv); \
+ (V)->tv_sec = (afs_int32)__afs_tv.tv_sec; \
+ (V)->tv_usec = (afs_int32)__afs_tv.tv_usec; \
+ } while (0)
+#else
+#define osi_GetTime(V) do_gettimeofday((V))
+#endif
#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_LINUX24_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))
-
-/* bcopy is in stds.h, just so fcrpyt.c can pick it up. */
-#define bzero(D,C) memset((D), 0, (C))
-#define bcmp(A,B,C) memcmp((A), (B), (C))
+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.
*/
+#include <asm/uaccess.h>
+
#ifdef KERNEL_SPACE_DECL
#undef KERNEL_SPACE_DECL
#undef TO_USER_SPACE
#define TO_USER_SPACE() { _fs_space_decl = get_fs(); set_fs(get_ds()); }
#define TO_KERNEL_SPACE() set_fs(_fs_space_decl)
-/* Backwards compatibilty macros - copyin/copyout are redone because macro
- * inside parentheses is not evalutated.
- */
-#define memcpy_fromfs copy_from_user
-#define memcpy_tofs copy_to_user
-#define copyin(F, T, C) (copy_from_user ((char*)(T), (char*)(F), (C)), 0)
-#define copyinstr(F, T, C, L) (copyin(F, T, C), *(L)=strlen(T), 0)
-#define copyout(F, T, C) (copy_to_user ((char*)(T), (char*)(F), (C)), 0)
+#define copyin(F, T, C) (copy_from_user ((char*)(T), (char*)(F), (C)) > 0 ? EFAULT : 0)
+static inline long copyinstr(char *from, char *to, int count, int *length) {
+ long tmp;
+ tmp = strncpy_from_user(to, from, count);
+ if (tmp < 0)
+ return EFAULT;
+ *length = tmp;
+ return 0;
+}
+#define copyout(F, T, C) (copy_to_user ((char*)(T), (char*)(F), (C)) > 0 ? EFAULT : 0)
/* kernel print statements */
#define printf printk
#define PAGESIZE PAGE_SIZE
+#ifndef NGROUPS
+#define NGROUPS NGROUPS_SMALL
+#endif
/* cred struct */
typedef struct cred { /* maps to task field: */
int cr_ref;
- unsigned short cr_uid; /* euid */
- unsigned short cr_ruid; /* uid */
- unsigned short cr_gid; /* egid */
- unsigned short 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
+ struct cred *cr_next;
} cred_t;
#define AFS_UCRED cred
+#define AFS_PROC struct task_struct
#define crhold(c) (c)->cr_ref++
/* UIO manipulation */
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;
- int 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
/* Get/set the inode in the osifile struct. */
#define FILE_INODE(F) (F)->f_dentry->d_inode
+#ifdef AFS_LINUX24_ENV
+#define OSIFILE_INODE(a) FILE_INODE((a)->filp)
+#else
+#define OSIFILE_INODE(a) FILE_INODE(&(a)->file)
+#endif
+
+#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)
+#define NEED_IOCTL32
+#endif
/* page offset is obtained and stored here during module initialization
* We need a variable to do this because, the PAGE_OFFSET macro defined in
*/
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)
+#if defined(__KERNEL__)
+#include "../h/sched.h"
#include "linux/wait.h"
extern struct semaphore afs_global_lock;
#define AFS_GUNLOCK() \
do { \
if (!ISAFS_GLOCK()) \
- osi_Panic("afs global lock not held"); \
+ osi_Panic("afs global lock not held at %s:%d", __FILE__, __LINE__); \
afs_global_owner = 0; \
up(&afs_global_lock); \
} while (0)
#define AFS_GUNLOCK()
#define ISAFS_GLOCK() 1
#define AFS_ASSERT_GLOCK()
-#define AFS_ASSERT_RXGLOCK()
#endif
-#define AFS_RXGLOCK()
-#define AFS_RXGUNLOCK()
-#define ISAFS_RXGLOCK() 1
#endif /* OSI_MACHDEP_H_ */
git://git.openafs.org / openafs.git / blobdiff