X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flinux%2Flinux-fs.h;h=fedaf602717fc471abdf3dd612abaea445644473;hb=4a8f90cfdf8868d25f14b02214e51e7423d70160;hp=53975ab23ee7c673b8cb6bc1f5143a7ec3112e37;hpb=2841be335687840cf98961e6c6cde6ee9312e4d7;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/linux/linux-fs.h b/libcfs/include/libcfs/linux/linux-fs.h
index 53975ab..fedaf60 100644
--- a/libcfs/include/libcfs/linux/linux-fs.h
+++ b/libcfs/include/libcfs/linux/linux-fs.h
@@ -27,7 +27,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, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -53,32 +53,16 @@
 #include <linux/stat.h>
 #include <linux/mount.h>
 #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)
-
-#ifdef HAVE_FILE_FSYNC_4ARGS
-# define do_fsync(fp, flag)				\
-	((fp)->f_op->fsync(fp, 0, LLONG_MAX, flag))
-#elif defined(HAVE_FILE_FSYNC_2ARGS)
-# define do_fsync(fp, flag)				\
-	((fp)->f_op->fsync(fp, flag))
+#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 do_fsync(fp, flag)				\
-	((fp)->f_op->fsync(fp, (fp)->f_dentry, flag))
+#define ll_vfs_fsync_range(fp, start, end, datasync) \
+	vfs_fsync_range(fp, (fp)->f_path.dentry, start, end, datasync)
 #endif
 
-#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))
-
-#define filp_fsync(fp)					\
-	do_fsync(fp, 1)
-
 #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)
@@ -88,9 +72,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
@@ -102,4 +83,13 @@ ssize_t filp_user_write(struct file *filp, const void *buf, size_t count,
 #define DTTOIF(dirtype)		((dirtype) << IFSHIFT)
 #endif
 
+#ifndef HAVE_POSIXACL_USER_NS
+/*
+ * Mask out &init_user_ns so we don't jump
+ * through hoops to define it somehow only
+ * to have it ignored anyway.
+ */
+#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
 #endif