Revert syscalls back-port from 4.10

[platform/upstream/linux-glibc-devel.git] / usr / include / linux / fs.h

diff --git a/usr/include/linux/fs.h b/usr/include/linux/fs.h
index 3d248ed..abe7d5c 100644 (file)
--- a/usr/include/linux/fs.h
+++ b/usr/include/linux/fs.h
@@ -35,10 +35,6 @@
 #define SEEK_HOLE      4       /* seek to the next hole */
 #define SEEK_MAX       SEEK_HOLE
 
-#define RENAME_NOREPLACE       (1 << 0)        /* Don't overwrite target */
-#define RENAME_EXCHANGE                (1 << 1)        /* Exchange source and dest */
-#define RENAME_WHITEOUT                (1 << 2)        /* Whiteout source */
-
 struct fstrim_range {
        __u64 start;
        __u64 len;
@@ -53,9 +49,9 @@ struct files_stat_struct {
 };
 
 struct inodes_stat_t {
-       long nr_inodes;
-       long nr_unused;
-       long dummy[5];          /* padding for sysctl ABI compatibility */
+       int nr_inodes;
+       int nr_unused;
+       int dummy[5];           /* padding for sysctl ABI compatibility */
 };
 
 
@@ -90,7 +86,6 @@ struct inodes_stat_t {
 #define MS_KERNMOUNT   (1<<22) /* this is a kern_mount call */
 #define MS_I_VERSION   (1<<23) /* Update inode I_version field */
 #define MS_STRICTATIME (1<<24) /* Always perform atime updates */
-#define MS_LAZYTIME    (1<<25) /* Update the on-disk [acm]times lazily */
 
 /* These sb flags are internal to the kernel */
 #define MS_NOSEC       (1<<28)
@@ -101,8 +96,7 @@ struct inodes_stat_t {
 /*
  * Superblock flags that can be altered by MS_REMOUNT
  */
-#define MS_RMT_MASK    (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION|\
-                        MS_LAZYTIME)
+#define MS_RMT_MASK    (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
 
 /*
  * Old magic mount flag and mask