[PATCH] ramfs: ignore tmpfs options when we emulate it

[Mike Frysinger]

On systems where CONFIG_SHMEM is disabled, mounting tmpfs filesystems can
fail when tmpfs options are used.  This is because tmpfs creates a small
wrapper around ramfs which rejects unknown options, and ramfs itself only
supports a tiny subset of what tmpfs supports.  This makes it pretty hard
to use the same userspace systems across different configuration systems.
As such, ramfs should ignore the tmpfs options when tmpfs is merely a
wrapper around ramfs.

This used to work before commit c3b1b1cbf0 as previously, ramfs would
ignore all options.  But now, we get:
ramfs: bad mount option: size=10M
mount: mounting mdev on /dev failed: Invalid argument

Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
---
another option might be to restore the previous behavior where ramfs simply
ignored all unknown mount options ...

 fs/ramfs/inode.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index 3a6b193..57a797c 100644
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -203,6 +203,16 @@ static int ramfs_parse_options(char *data, struct ramfs_mount_opts *opts)
 			opts->mode = option & S_IALLUGO;
 			break;
 		default:
+#ifndef CONFIG_SHMEM
+			/* If tmpfs is using us to emulate it, ignore its options */
+			if (!strncmp(p, "gid=", 4) ||
+			    !strncmp(p, "mpol=", 5) ||
+			    !strncmp(p, "nr_blocks=", 10) ||
+			    !strncmp(p, "nr_inodes=", 10) ||
+			    !strncmp(p, "size=", 5) ||
+			    !strncmp(p, "uid=", 4))
+				continue;
+#endif
 			printk(KERN_ERR "ramfs: bad mount option: %s\n", p);
 			return -EINVAL;
 		}
-- 
1.6.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/