emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mount: implement -o nosymfollow, remove bogus -o union

Browse Source 
The (1 << 8) MS_ flag is MS_NOSYMFOLLOW, not MS_UNION.
As far as I see in git history of kernel and util-linux,
MS_UNION did not ever exist.
Why did it appear in our tree in 2009?...

function                                             old     new   delta
mount_option_str                                     379     385      +6

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-12-06 21:47:24 +01:00
parent 696c38ddca
commit 34c5115a7f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util-linux/mount.c
View File

@ -188,8 +188,8 @@
#ifndef MS_DIRSYNC #ifndef MS_DIRSYNC
# define MS_DIRSYNC (1 << 7) // Directory modifications are synchronous # define MS_DIRSYNC (1 << 7) // Directory modifications are synchronous
#endif #endif
#ifndef MS_UNION #ifndef MS_NOSYMFOLLOW
# define MS_UNION (1 << 8) # define MS_NOSYMFOLLOW (1 << 8)
#endif #endif
#ifndef MS_BIND #ifndef MS_BIND
# define MS_BIND (1 << 12) # define MS_BIND (1 << 12)
@ -368,13 +368,13 @@ static const int32_t mount_options[] ALIGN4 = {
/* "nostrictatime"*/ ~MS_STRICTATIME, /* "nostrictatime"*/ ~MS_STRICTATIME,
/* "lazytime" */ MS_LAZYTIME, /* "lazytime" */ MS_LAZYTIME,
/* "nolazytime" */ ~MS_LAZYTIME, /* "nolazytime" */ ~MS_LAZYTIME,
/* "nosymfollow" */ MS_NOSYMFOLLOW,
/* "mand" */ MS_MANDLOCK, /* "mand" */ MS_MANDLOCK,
/* "nomand" */ ~MS_MANDLOCK, /* "nomand" */ ~MS_MANDLOCK,
/* "loud" */ ~MS_SILENT, /* "loud" */ ~MS_SILENT,
// action flags // action flags
/* "rbind" */ MS_BIND|MS_RECURSIVE, /* "rbind" */ MS_BIND|MS_RECURSIVE,
/* "union" */ MS_UNION,
/* "bind" */ MS_BIND, /* "bind" */ MS_BIND,
/* "move" */ MS_MOVE, /* "move" */ MS_MOVE,
/* "shared" */ MS_SHARED, /* "shared" */ MS_SHARED,
@ -430,13 +430,13 @@ static const char mount_option_str[] ALIGN1 =
"nostrictatime""\0" "nostrictatime""\0"
"lazytime" "\0" "lazytime" "\0"
"nolazytime" "\0" "nolazytime" "\0"
"nosymfollow" "\0"
"mand" "\0" "mand" "\0"
"nomand" "\0" "nomand" "\0"
"loud" "\0" "loud" "\0"
// action flags // action flags
"rbind\0" "rbind\0"
"union\0"
"bind\0" "bind\0"
"move\0" "move\0"
"make-shared\0" "make-shared\0"