Title: [6697] trunk/fs/ramfs/inode.c: ignore tmpfs mount options so mounting of /dev with default /etc/rc script works again
- Revision
- 6697
- Author
- vapier
- Date
- 2009-06-13 05:45:12 -0500 (Sat, 13 Jun 2009)
Log Message
ignore tmpfs mount options so mounting of /dev with default /etc/rc script works again
Modified Paths
Diff
Modified: trunk/fs/ramfs/inode.c (6696 => 6697)
--- trunk/fs/ramfs/inode.c 2009-06-13 10:44:42 UTC (rev 6696)
+++ trunk/fs/ramfs/inode.c 2009-06-13 10:45:12 UTC (rev 6697)
@@ -203,6 +203,16 @@
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;
}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
