* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
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 */
-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 */
int it_disposition;
int it_status;
__u64 it_lock_handle;
- void *it_data;
int it_lock_mode;
+ 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)
#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);
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)))
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)
{
#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>