* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#ifndef _LUSTRE_COMPAT_H
#define _LUSTRE_COMPAT_H
+#include <linux/aio.h>
+#include <linux/fs.h>
#include <linux/fs_struct.h>
#include <linux/namei.h>
#include <linux/pagemap.h>
#include <linux/bio.h>
#include <linux/xattr.h>
+#include <linux/workqueue.h>
-#include <libcfs/libcfs.h>
+#include <libcfs/linux/linux-fs.h>
#include <lustre_patchless_compat.h>
#include <obd_support.h>
# define UNLOCK_FS_STRUCT(fs) spin_unlock(&(fs)->lock)
#endif
+#ifdef HAVE_FS_STRUCT_SEQCOUNT
+# define WRITE_FS_SEQ_BEGIN(fs) write_seqcount_begin(&(fs)->seq)
+# define WRITE_FS_SEQ_END(fs) write_seqcount_end(&(fs)->seq)
+#else
+# define WRITE_FS_SEQ_BEGIN(fs)
+# define WRITE_FS_SEQ_END(fs)
+#endif
static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
struct dentry *dentry)
{
- struct path path;
- struct path old_pwd;
-
- path.mnt = mnt;
- path.dentry = dentry;
- LOCK_FS_STRUCT(fs);
- old_pwd = fs->pwd;
- path_get(&path);
- fs->pwd = path;
- UNLOCK_FS_STRUCT(fs);
-
- if (old_pwd.dentry)
- path_put(&old_pwd);
+ struct path path;
+ struct path old_pwd;
+
+ path.mnt = mnt;
+ path.dentry = dentry;
+ path_get(&path);
+ LOCK_FS_STRUCT(fs);
+ WRITE_FS_SEQ_BEGIN(fs);
+ old_pwd = fs->pwd;
+ fs->pwd = path;
+ WRITE_FS_SEQ_END(fs);
+ UNLOCK_FS_STRUCT(fs);
+
+ if (old_pwd.dentry)
+ path_put(&old_pwd);
}
/*
}
#endif
+#ifndef HAVE_PTR_ERR_OR_ZERO
+static inline int __must_check PTR_ERR_OR_ZERO(__force const void *ptr)
+{
+ if (IS_ERR(ptr))
+ return PTR_ERR(ptr);
+ else
+ return 0;
+}
+#endif
+
#ifndef SIZE_MAX
#define SIZE_MAX (~(size_t)0)
#endif
#ifndef HAVE_VFS_SETXATTR
const struct xattr_handler *get_xattr_type(const char *name);
-#ifdef HAVE_XATTR_HANDLER_FLAGS
static inline int
__vfs_setxattr(struct dentry *dentry, struct inode *inode, const char *name,
const void *value, size_t size, int flags)
{
+# ifdef HAVE_XATTR_HANDLER_FLAGS
const struct xattr_handler *handler;
int rc;
handler = get_xattr_type(name);
if (!handler)
- return -ENXIO;
-
-#if defined(HAVE_XATTR_HANDLER_INODE_PARAM)
- rc = handler->set(handler, dentry, inode, name, value, size,
- XATTR_CREATE);
-#elif defined(HAVE_XATTR_HANDLER_SIMPLIFIED)
- rc = handler->set(handler, dentry, name, value, size, XATTR_CREATE);
-#else
- rc = handler->set(dentry, name, value, size, XATTR_CREATE,
- handler->flags);
-#endif /* !HAVE_XATTR_HANDLER_INODE_PARAM */
+ return -EOPNOTSUPP;
+
+# if defined(HAVE_XATTR_HANDLER_INODE_PARAM)
+ rc = handler->set(handler, dentry, inode, name, value, size, flags);
+# elif defined(HAVE_XATTR_HANDLER_SIMPLIFIED)
+ rc = handler->set(handler, dentry, name, value, size, flags);
+# else
+ rc = handler->set(dentry, name, value, size, flags, handler->flags);
+# endif /* !HAVE_XATTR_HANDLER_INODE_PARAM */
return rc;
-}
-#else /* !HAVE_XATTR_HANDLER_FLAGS */
-static inline int
-__vfs_setxattr(struct dentry *dentry, struct inode *inode, const char *name,
- const void *value, size_t size, int flags)
-{
+# else /* !HAVE_XATTR_HANDLER_FLAGS */
return ll_setxattr(dentry, name, value, size, flags);
+# endif /* HAVE_XATTR_HANDLER_FLAGS */
}
-#endif /* HAVE_XATTR_HANDLER_FLAGS */
#endif /* HAVE_VFS_SETXATTR */
+#ifdef HAVE_IOP_SET_ACL
+#ifdef CONFIG_FS_POSIX_ACL
+#ifndef HAVE_POSIX_ACL_UPDATE_MODE
+static inline int posix_acl_update_mode(struct inode *inode, umode_t *mode_p,
+ struct posix_acl **acl)
+{
+ umode_t mode = inode->i_mode;
+ int error;
+
+ error = posix_acl_equiv_mode(*acl, &mode);
+ if (error < 0)
+ return error;
+ if (error == 0)
+ *acl = NULL;
+ if (!in_group_p(inode->i_gid) &&
+ !capable_wrt_inode_uidgid(inode, CAP_FSETID))
+ mode &= ~S_ISGID;
+ *mode_p = mode;
+ return 0;
+}
+#endif /* HAVE_POSIX_ACL_UPDATE_MODE */
+#endif
+#endif
+
#ifndef HAVE_IOV_ITER_TRUNCATE
static inline void iov_iter_truncate(struct iov_iter *i, u64 count)
{
# define ll_filemap_fault(vma, vmf) filemap_fault(vma, vmf)
#endif
+#ifndef HAVE_CURRENT_TIME
+static inline struct timespec current_time(struct inode *inode)
+{
+ return CURRENT_TIME;
+}
+#endif
+
+#ifndef time_after32
+/**
+ * time_after32 - compare two 32-bit relative times
+ * @a: the time which may be after @b
+ * @b: the time which may be before @a
+ *
+ * time_after32(a, b) returns true if the time @a is after time @b.
+ * time_before32(b, a) returns true if the time @b is before time @a.
+ *
+ * Similar to time_after(), compare two 32-bit timestamps for relative
+ * times. This is useful for comparing 32-bit seconds values that can't
+ * be converted to 64-bit values (e.g. due to disk format or wire protocol
+ * issues) when it is known that the times are less than 68 years apart.
+ */
+#define time_after32(a, b) ((s32)((u32)(b) - (u32)(a)) < 0)
+#define time_before32(b, a) time_after32(a, b)
+
+#endif
+
+#ifndef __GFP_COLD
+#define __GFP_COLD 0
+#endif
+
+#ifndef alloc_workqueue
+#define alloc_workqueue(name, flags, max_active) create_workqueue(name)
+#endif
+
+#ifndef READ_ONCE
+#define READ_ONCE ACCESS_ONCE
+#endif
+
#endif /* _LUSTRE_COMPAT_H */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff