From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Oct 2008 16:19:03 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
X-Git-Tag: v2.6.28-rc1~98
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=396b122f6af3d329df3b4d688f6e66de3e2a399a

Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

* 'linux-next' of git://git.infradead.org/ubifs-2.6: (25 commits)
  UBIFS: fix ubifs_compress commentary
  UBIFS: amend printk
  UBIFS: do not read unnecessary bytes when unpacking bits
  UBIFS: check buffer length when scanning for LPT nodes
  UBIFS: correct condition to eliminate unecessary assignment
  UBIFS: add more debugging messages for LPT
  UBIFS: fix bulk-read handling uptodate pages
  UBIFS: improve garbage collection
  UBIFS: allow for sync_fs when read-only
  UBIFS: commit on sync_fs
  UBIFS: correct comment for commit_on_unmount
  UBIFS: update dbg_dump_inode
  UBIFS: fix commentary
  UBIFS: fix races in bit-fields
  UBIFS: ensure data read beyond i_size is zeroed out correctly
  UBIFS: correct key comparison
  UBIFS: use bit-fields when possible
  UBIFS: check data CRC when in error state
  UBIFS: improve znode splitting rules
  UBIFS: add no_chk_data_crc mount option
  ...
---

396b122f6af3d329df3b4d688f6e66de3e2a399a
diff --cc fs/ubifs/super.c
index 9a9220333b3b,046bf0879235..8780efbf40ac
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@@ -848,9 -891,13 +891,13 @@@ enum 
  	Opt_err,
  };
  
 -static match_table_t tokens = {
 +static const match_table_t tokens = {
  	{Opt_fast_unmount, "fast_unmount"},
  	{Opt_norm_unmount, "norm_unmount"},
+ 	{Opt_bulk_read, "bulk_read"},
+ 	{Opt_no_bulk_read, "no_bulk_read"},
+ 	{Opt_chk_data_crc, "chk_data_crc"},
+ 	{Opt_no_chk_data_crc, "no_chk_data_crc"},
  	{Opt_err, NULL},
  };