summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2014-04-03 21:55:37 +0200
committerJiri Slaby <jslaby@suse.cz>2014-05-29 11:38:24 +0200
commitc36604fe10ee69babe452bf5f888185ef163cd39 (patch)
treefa78ef7f3ed77316a1b3039e0985709a6f2c780e /fs
parent0610ae43cefde18c9270e7c791faa629382200f1 (diff)
downloadlinux-stable-c36604fe10ee69babe452bf5f888185ef163cd39.tar.gz
linux-stable-c36604fe10ee69babe452bf5f888185ef163cd39.tar.bz2
linux-stable-c36604fe10ee69babe452bf5f888185ef163cd39.zip
fs: Don't return 0 from get_anon_bdev
commit a2a4dc494a7b7135f460e38e788c4a58f65e4ac3 upstream. Commit 9e30cc9595303b27b48 removed an internal mount. This has the side-effect that rootfs now has FSID 0. Many userspace utilities assume that st_dev in struct stat is never 0, so this change breaks a number of tools in early userspace. Since we don't know how many userspace programs are affected, make sure that FSID is at least 1. References: http://article.gmane.org/gmane.linux.kernel/1666905 References: http://permalink.gmane.org/gmane.linux.utilities.util-linux-ng/8557 Signed-off-by: Thomas Bächler <thomas@archlinux.org> Acked-by: Tejun Heo <tj@kernel.org> Acked-by: H. Peter Anvin <hpa@zytor.com> Tested-by: Alexandre Demers <alexandre.f.demers@gmail.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/super.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c
index 0225c20f8770..d127de207376 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -845,7 +845,10 @@ void emergency_remount(void)
static DEFINE_IDA(unnamed_dev_ida);
static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */
-static int unnamed_dev_start = 0; /* don't bother trying below it */
+/* Many userspace utilities consider an FSID of 0 invalid.
+ * Always return at least 1 from get_anon_bdev.
+ */
+static int unnamed_dev_start = 1;
int get_anon_bdev(dev_t *p)
{