Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/uclibc/0.9.33.2: 18_all_mount.h.patch
Date: Sun, 27 Apr 2014 19:36:57
Message-Id: 20140427193653.B331A2004B@flycatcher.gentoo.org
1 vapier 14/04/27 19:36:53
2
3 Added: 18_all_mount.h.patch
4 Log:
5 Add fix from upstream for sys/mount.h updates #508522 by Anthony Basile.
6
7 Revision Changes Path
8 1.1 src/patchsets/uclibc/0.9.33.2/18_all_mount.h.patch
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/uclibc/0.9.33.2/18_all_mount.h.patch?rev=1.1&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/uclibc/0.9.33.2/18_all_mount.h.patch?rev=1.1&content-type=text/plain
12
13 Index: 18_all_mount.h.patch
14 ===================================================================
15 https://bugs.gentoo.org/508522
16
17 From 641a5356a021f90ee922229bd8e1aa6eafe152bc Mon Sep 17 00:00:00 2001
18 From: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com>
19 Date: Fri, 18 Jan 2013 11:12:49 +0100
20 Subject: [PATCH] mount.h: update
21
22 Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com>
23 ---
24 include/sys/mount.h | 45 +++++++++++++++++++++++++++++++++++----------
25 1 file changed, 35 insertions(+), 10 deletions(-)
26
27 diff --git a/include/sys/mount.h b/include/sys/mount.h
28 index 57d440f..9eecc5a 100644
29 --- a/include/sys/mount.h
30 +++ b/include/sys/mount.h
31 @@ -1,5 +1,5 @@
32 /* Header file for mounting/unmount Linux filesystems.
33 - Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc.
34 + Copyright (C) 1996-2000, 2004, 2010, 2012 Free Software Foundation, Inc.
35 This file is part of the GNU C Library.
36
37 The GNU C Library is free software; you can redistribute it and/or
38 @@ -47,23 +47,46 @@ enum
39 #define MS_REMOUNT MS_REMOUNT
40 MS_MANDLOCK = 64, /* Allow mandatory locks on an FS. */
41 #define MS_MANDLOCK MS_MANDLOCK
42 - S_WRITE = 128, /* Write on file/directory/symlink. */
43 -#define S_WRITE S_WRITE
44 - S_APPEND = 256, /* Append-only file. */
45 -#define S_APPEND S_APPEND
46 - S_IMMUTABLE = 512, /* Immutable file. */
47 -#define S_IMMUTABLE S_IMMUTABLE
48 + MS_DIRSYNC = 128, /* Directory modifications are synchronous. */
49 +#define MS_DIRSYNC MS_DIRSYNC
50 MS_NOATIME = 1024, /* Do not update access times. */
51 #define MS_NOATIME MS_NOATIME
52 MS_NODIRATIME = 2048, /* Do not update directory access times. */
53 #define MS_NODIRATIME MS_NODIRATIME
54 MS_BIND = 4096, /* Bind directory at different place. */
55 #define MS_BIND MS_BIND
56 + MS_MOVE = 8192,
57 +#define MS_MOVE MS_MOVE
58 + MS_REC = 16384,
59 +#define MS_REC MS_REC
60 + MS_SILENT = 32768,
61 +#define MS_SILENT MS_SILENT
62 + MS_POSIXACL = 1 << 16, /* VFS does not apply the umask. */
63 +#define MS_POSIXACL MS_POSIXACL
64 + MS_UNBINDABLE = 1 << 17, /* Change to unbindable. */
65 +#define MS_UNBINDABLE MS_UNBINDABLE
66 + MS_PRIVATE = 1 << 18, /* Change to private. */
67 +#define MS_PRIVATE MS_PRIVATE
68 + MS_SLAVE = 1 << 19, /* Change to slave. */
69 +#define MS_SLAVE MS_SLAVE
70 + MS_SHARED = 1 << 20, /* Change to shared. */
71 +#define MS_SHARED MS_SHARED
72 + MS_RELATIME = 1 << 21, /* Update atime relative to mtime/ctime. */
73 +#define MS_RELATIME MS_RELATIME
74 + MS_KERNMOUNT = 1 << 22, /* This is a kern_mount call. */
75 +#define MS_KERNMOUNT MS_KERNMOUNT
76 + MS_I_VERSION = 1 << 23, /* Update inode I_version field. */
77 +#define MS_I_VERSION MS_I_VERSION
78 + MS_STRICTATIME = 1 << 24, /* Always perform atime updates. */
79 +#define MS_STRICTATIME MS_STRICTATIME
80 + MS_ACTIVE = 1 << 30,
81 +#define MS_ACTIVE MS_ACTIVE
82 + MS_NOUSER = 1 << 31
83 +#define MS_NOUSER MS_NOUSER
84 };
85
86 /* Flags that can be altered by MS_REMOUNT */
87 -#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \
88 - |MS_NODIRATIME)
89 +#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
90
91
92 /* Magic mount flag number. Has to be or-ed to the flag values. */
93 @@ -100,8 +123,10 @@ enum
94 #define MNT_FORCE MNT_FORCE
95 MNT_DETACH = 2, /* Just detach from the tree. */
96 #define MNT_DETACH MNT_DETACH
97 - MNT_EXPIRE = 4 /* Mark for expiry. */
98 + MNT_EXPIRE = 4, /* Mark for expiry. */
99 #define MNT_EXPIRE MNT_EXPIRE
100 + UMOUNT_NOFOLLOW = 8 /* Don't follow symlink on umount. */
101 +#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW
102 };
103
104
105 --
106 1.9.2