Title: [6735] trunk/fs/ramfs/inode.c: use ramfs change that was merged into mainline
- Revision
- 6735
- Author
- vapier
- Date
- 2009-06-16 02:01:25 -0500 (Tue, 16 Jun 2009)
Log Message
use ramfs change that was merged into mainline
Modified Paths
Diff
Modified: trunk/fs/ramfs/inode.c (6734 => 6735)
--- trunk/fs/ramfs/inode.c 2009-06-16 05:35:32 UTC (rev 6734)
+++ trunk/fs/ramfs/inode.c 2009-06-16 07:01:25 UTC (rev 6735)
@@ -202,19 +202,12 @@
return -EINVAL;
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;
+ /*
+ * We might like to report bad mount options here;
+ * but traditionally ramfs has ignored all mount options,
+ * and as it is used as a !CONFIG_SHMEM simple substitute
+ * for tmpfs, better continue to ignore other mount options.
+ */
}
}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
