diff options
author | Thomas Bächler <thomas@archlinux.org> | 2014-04-03 15:55:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-16 14:53:08 -0400 |
commit | a2a4dc494a7b7135f460e38e788c4a58f65e4ac3 (patch) | |
tree | 8b593307370f6e4ade7630be2a1e66eb2770e745 /fs/super.c | |
parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) |
fs: Don't return 0 from get_anon_bdev
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
Cc: 3.14 <stable@vger.kernel.org>
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/super.c')
-rw-r--r-- | fs/super.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c index e9dc3c3fe159..48377f7463c0 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -800,7 +800,10 @@ void emergency_remount(void) | |||
800 | 800 | ||
801 | static DEFINE_IDA(unnamed_dev_ida); | 801 | static DEFINE_IDA(unnamed_dev_ida); |
802 | static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */ | 802 | static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */ |
803 | static int unnamed_dev_start = 0; /* don't bother trying below it */ | 803 | /* Many userspace utilities consider an FSID of 0 invalid. |
804 | * Always return at least 1 from get_anon_bdev. | ||
805 | */ | ||
806 | static int unnamed_dev_start = 1; | ||
804 | 807 | ||
805 | int get_anon_bdev(dev_t *p) | 808 | int get_anon_bdev(dev_t *p) |
806 | { | 809 | { |