LU-9003 mdc: support posix_acl_valid with user namespace

[fs/lustre-release.git] / libcfs / include / libcfs / linux / linux-fs.h

diff --git a/libcfs/include/libcfs/linux/linux-fs.h b/libcfs/include/libcfs/linux/linux-fs.h
index 8d0f6a0..59d9874 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-fs.h
+++ b/libcfs/include/libcfs/linux/linux-fs.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -55,23 +51,19 @@
 #include <linux/backing-dev.h>
 #include <linux/posix_acl_xattr.h>
 
-#define filp_size(f)                                   \
-       (i_size_read((f)->f_dentry->d_inode))
-#define filp_poff(f)                                   \
-       (&(f)->f_pos)
-
-#define filp_read(fp, buf, size, pos)                  \
-       ((fp)->f_op->read((fp), (buf), (size), pos))
-
-#define filp_write(fp, buf, size, pos)                 \
-       ((fp)->f_op->write((fp), (buf), (size), pos))
+#ifndef HAVE_FILE_DENTRY
+static inline struct dentry *file_dentry(const struct file *file)
+{
+       return file->f_path.dentry;
+}
+#endif
 
-#ifdef HAVE_FILE_FSYNC_4ARGS
-#define filp_fsync(fp, start, end) ((fp)->f_op->fsync((fp), start, end, 1))
-#elif defined(HAVE_FILE_FSYNC_2ARGS)
-#define filp_fsync(fp, start, end) ((fp)->f_op->fsync((fp), 1))
+#if defined(HAVE_FILE_FSYNC_4ARGS) || defined(HAVE_FILE_FSYNC_2ARGS)
+#define ll_vfs_fsync_range(fp, start, end, datasync) \
+       vfs_fsync_range(fp, start, end, datasync)
 #else
-#define filp_fsync(fp, start, end) ((fp)->f_op->fsync((fp), (fp)->f_dentry, 1))
+#define ll_vfs_fsync_range(fp, start, end, datasync) \
+       vfs_fsync_range(fp, file_dentry(fp), start, end, datasync)
 #endif
 
 #define flock_type(fl)                 ((fl)->fl_type)
@@ -83,9 +75,6 @@
 #define flock_end(fl)                  ((fl)->fl_end)
 #define flock_set_end(fl, end)         do { (fl)->fl_end = (end); } while (0)
 
-ssize_t filp_user_write(struct file *filp, const void *buf, size_t count,
-                       loff_t *offset);
-
 #ifndef IFSHIFT
 #define IFSHIFT                        12
 #endif
@@ -106,4 +95,8 @@ ssize_t filp_user_write(struct file *filp, const void *buf, size_t count,
 #define posix_acl_from_xattr(a,b,c)    posix_acl_from_xattr(b,c)
 #define posix_acl_to_xattr(a,b,c,d)    posix_acl_to_xattr(b,c,d)
 #endif
+
+#ifndef HAVE_POSIX_ACL_VALID_USER_NS
+#define posix_acl_valid(a,b) posix_acl_valid(b)
+#endif
 #endif