Magellan Linux

Annotation of /trunk/busybox/patches/busybox-1.20.2-undo-recent-breakage-when-mount-flags-were-made-unsigned.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1856 - (hide annotations) (download)
Thu Jul 26 09:16:24 2012 UTC (11 years, 9 months ago) by niro
File size: 778 byte(s)
-more upstream patches
1 niro 1856 From a396ade9f83f05a65b0a6df3dcbdeb8cfef0c696 Mon Sep 17 00:00:00 2001
2     From: Denys Vlasenko <vda.linux@googlemail.com>
3     Date: Fri, 22 Jun 2012 13:06:27 +0000
4     Subject: mount: undo recent breakage when mount flags were made unsigned
5    
6     Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7     ---
8     diff --git a/util-linux/mount.c b/util-linux/mount.c
9     index 220a4e6..95dee18 100644
10     --- a/util-linux/mount.c
11     +++ b/util-linux/mount.c
12     @@ -467,7 +467,7 @@ static unsigned long parse_mount_options(char *options, char **unrecognized)
13     for (i = 0; i < ARRAY_SIZE(mount_options); i++) {
14     if (strcasecmp(option_str, options) == 0) {
15     unsigned long fl = mount_options[i];
16     - if (fl < 0)
17     + if ((long)fl < 0)
18     flags &= fl;
19     else
20     flags |= fl;
21     --
22     cgit v0.9.0.1-2-gef13