-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#endif
-/* always adopt 2.5 definitions */
-#define KERNEL_VERSION(a,b,c) ((a)*100+(b)*10+c)
-#define LINUX_VERSION_CODE KERNEL_VERSION(2,6,5)
-
#ifndef page_private
#define page_private(page) ((page)->private)
#define set_page_private(page, v) ((page)->private = (v))
static __inline__ int ext2_set_bit(int nr, void *addr)
{
#ifdef __BIG_ENDIAN
- return cfs_set_bit((nr ^ ((BITS_PER_LONG-1) & ~0x7)), addr);
+ return set_bit((nr ^ ((BITS_PER_LONG-1) & ~0x7)), addr);
#else
- return cfs_set_bit(nr, addr);
+ return set_bit(nr, addr);
#endif
}
-static __inline__ int ext2_clear_bit(int nr, void *addr)
+static inline int ext2_clear_bit(int nr, void *addr)
{
#ifdef __BIG_ENDIAN
- return cfs_clear_bit((nr ^ ((BITS_PER_LONG-1) & ~0x7)), addr);
+ return clear_bit((nr ^ ((BITS_PER_LONG-1) & ~0x7)), addr);
#else
- return cfs_clear_bit(nr, addr);
+ return clear_bit(nr, addr);
#endif
}
__const__ unsigned char *tmp = (__const__ unsigned char *) addr;
return (tmp[nr >> 3] >> (nr & 7)) & 1;
#else
- return cfs_test_bit(nr, addr);
+ return test_bit(nr, addr);
#endif
}
/* general stuff */
-#define EXPORT_SYMBOL(S)
-
-typedef struct cfs_rcu_head { } cfs_rcu_head_t;
-
-typedef __u64 kdev_t;
-
#ifndef min
#define min(x,y) ((x)<(y) ? (x) : (y))
#endif
/* memory */
/* memory size: used for some client tunables */
-#define cfs_num_physpages (256 * 1024) /* 1GB */
-#define CFS_NUM_CACHEPAGES cfs_num_physpages
+#define num_physpages (256 * 1024) /* 1GB */
+#define NUM_CACHEPAGES num_physpages
/* VFS stuff */
#define ATTR_BLOCKS 0x4000
#define ATTR_KILL_SUID 0
#define ATTR_KILL_SGID 0
+#define ATTR_FILE 0
struct iattr {
unsigned int ia_valid;
unsigned int ia_attr_flags;
};
-#define ll_iattr iattr
-
-#define IT_OPEN 0x0001
-#define IT_CREAT 0x0002
-#define IT_READDIR 0x0004
-#define IT_GETATTR 0x0008
-#define IT_LOOKUP 0x0010
-#define IT_UNLINK 0x0020
-#define IT_GETXATTR 0x0040
-#define IT_EXEC 0x0080
-#define IT_PIN 0x0100
-
-#define IT_FL_LOCKED 0x0001
-#define IT_FL_FOLLOWED 0x0002 /* set by vfs_follow_link */
-
+/* defined in kernel header include/linux/namei.h */
#define INTENT_MAGIC 0x19620323
struct lustre_intent_data {
int it_disposition;
int it_status;
__u64 it_lock_handle;
- void *it_data;
int it_lock_mode;
- int it_int_flags;
+ int it_remote_lock_mode;
+ __u64 it_remote_lock_handle;
+ void *it_data;
+
+ unsigned int it_lock_set:1;
};
+
struct lookup_intent {
- int it_magic;
- void (*it_op_release)(struct lookup_intent *);
- int it_op;
- int it_flags;
- int it_create_mode;
- union {
- struct lustre_intent_data lustre;
- } d;
+ int it_magic;
+ void (*it_op_release)(struct lookup_intent *);
+ int it_op;
+ int it_create_mode;
+ __u64 it_flags;
+ union {
+ struct lustre_intent_data lustre;
+ } d;
};
static inline void intent_init(struct lookup_intent *it, int op, int flags)
int signal;
};
+#undef LL_TASK_CL_ENV
+#define LL_TASK_CL_ENV cl_env
+
struct task_struct {
int state;
struct signal pending;
int max_groups;
int ngroups;
gid_t *groups;
+ void *cl_env;
__u32 cap_effective;
};
#define cfs_curproc_comm() (current->comm)
#define cfs_curproc_fsuid() (current->fsuid)
#define cfs_curproc_fsgid() (current->fsgid)
+#define cfs_curproc_umask() ({ mode_t mask = umask(0); umask(mask); mask; })
extern struct task_struct *current;
int cfs_curproc_is_in_groups(gid_t gid);
ret; \
}
-#define cfs_lock_kernel() do {} while (0)
-#define cfs_unlock_kernel() do {} while (0)
#define daemonize(l) do {} while (0)
#define sigfillset(l) do {} while (0)
#define recalc_sigpending(l) do {} while (0)
#define might_sleep_if(c)
#define smp_mb()
-#define libcfs_memory_pressure_get() (0)
-#define libcfs_memory_pressure_put() do {} while (0)
-#define libcfs_memory_pressure_clr() do {} while (0)
-
/* FIXME sys/capability will finally included linux/fs.h thus
* cause numerous trouble on x86-64. as temporary solution for
* build broken at Cray, we copy definition we need from capability.h
void *host;
};
-typedef struct file_lock {
+struct file_lock {
struct file_lock *fl_next; /* singly linked list for this inode */
cfs_list_t fl_link; /* doubly linked list of all locks */
cfs_list_t fl_block; /* circular list of blocked processes */
union {
struct nfs_lock_info nfs_fl;
} fl_u;
-} cfs_flock_t;
+};
-#define cfs_flock_type(fl) ((fl)->fl_type)
-#define cfs_flock_set_type(fl, type) do { (fl)->fl_type = (type); } while(0)
-#define cfs_flock_pid(fl) ((fl)->fl_pid)
-#define cfs_flock_set_pid(fl, pid) do { (fl)->fl_pid = (pid); } while(0)
-#define cfs_flock_start(fl) ((fl)->fl_start)
-#define cfs_flock_set_start(fl, start) do { (fl)->fl_start = (start); } while(0)
-#define cfs_flock_end(fl) ((fl)->fl_end)
-#define cfs_flock_set_end(fl, end) do { (fl)->fl_end = (end); } while(0)
+#define flock_type(fl) ((fl)->fl_type)
+#define flock_set_type(fl, type) do { (fl)->fl_type = (type); } while (0)
+#define flock_pid(fl) ((fl)->fl_pid)
+#define flock_set_pid(fl, pid) do { (fl)->fl_pid = (pid); } while (0)
+#define flock_start(fl) ((fl)->fl_start)
+#define flock_set_start(fl, st) do { (fl)->fl_start = (st); } while (0)
+#define flock_end(fl) ((fl)->fl_end)
+#define flock_set_end(fl, end) do { (fl)->fl_end = (end); } while (0)
#ifndef OFFSET_MAX
#define INT_LIMIT(x) (~((x)1 << (sizeof(x)*8 - 1)))
#define i_atime i_stbuf.st_atime
#define i_mtime i_stbuf.st_mtime
#define i_ctime i_stbuf.st_ctime
-#define i_size i_stbuf.st_size
+/* use i_size_read() i_size_write() to access i_stbuf.st_size */
#define i_blocks i_stbuf.st_blocks
#define i_blksize i_stbuf.st_blksize
#define i_mode i_stbuf.st_mode
#define NO_QUOTA 1
/* ACL */
-struct posix_acl_entry {
- short e_tag;
- unsigned short e_perm;
- unsigned int e_id;
-};
-
-struct posix_acl {
- cfs_atomic_t a_refcount;
- unsigned int a_count;
- struct posix_acl_entry a_entries[0];
-};
-
typedef struct {
__u16 e_tag;
__u16 e_perm;
__u32 e_id;
-} xattr_acl_entry;
+} posix_acl_xattr_entry;
+
+struct posix_acl {
+ cfs_atomic_t a_refcount;
+ unsigned int a_count;
+ posix_acl_xattr_entry a_entries[0];
+};
typedef struct {
- __u32 a_version;
- xattr_acl_entry a_entries[0];
-} xattr_acl_header;
+ __u32 a_version;
+ posix_acl_xattr_entry a_entries[0];
+} posix_acl_xattr_header;
-static inline size_t xattr_acl_size(int count)
+static inline size_t posix_acl_xattr_size(int count)
{
- return sizeof(xattr_acl_header) + count * sizeof(xattr_acl_entry);
+ return sizeof(posix_acl_xattr_header) + count *
+ sizeof(posix_acl_xattr_entry);
}
static inline
return NULL;
}
+/* The kernel version takes 3 arguments, so strip that off first. */
+#define posix_acl_from_xattr(a,b,c) posix_acl_from_xattr(b,c)
+#define posix_acl_to_xattr(a,b,c) posix_acl_to_xattr(b,c)
+
static inline
int posix_acl_valid(const struct posix_acl *acl)
{
{
}
-#ifdef LIBLUSTRE_POSIX_ACL
-# ifndef posix_acl_xattr_entry
-# define posix_acl_xattr_entry xattr_acl_entry
-# endif
-# ifndef posix_acl_xattr_header
-# define posix_acl_xattr_header xattr_acl_header
-# endif
-# ifndef posix_acl_xattr_size
-# define posix_acl_xattr_size(entry) xattr_acl_size(entry)
-# endif
-# ifndef CONFIG_FS_POSIX_ACL
-# define CONFIG_FS_POSIX_ACL 1
-# endif
+#if defined(LIBLUSTRE_POSIX_ACL) && !defined(CONFIG_FS_POSIX_ACL)
+# define CONFIG_FS_POSIX_ACL 1
#endif
#ifndef ENOTSUPP
#define S_IRWXUGO (S_IRWXU|S_IRWXG|S_IRWXO)
#define S_IALLUGO (S_ISUID|S_ISGID|S_ISVTX|S_IRWXUGO)
+struct inode *igrab(struct inode *inode);
+void iput(struct inode *inode);
+
#include <obd_support.h>
#include <lustre/lustre_idl.h>
#include <lustre_lib.h>
git://git.whamcloud.com / fs / lustre-release.git / blobdiff