litmus-rt.git/fs/jffs2, branch linux-tip

Merge git://git.infradead.org/mtd-2.6

2010-10-30T15:31:35+00:00

* git://git.infradead.org/mtd-2.6: (82 commits)
  mtd: fix build error in m25p80.c
  mtd: Remove redundant mutex from mtd_blkdevs.c
  MTD: Fix wrong check register_blkdev return value
  Revert "mtd: cleanup Kconfig dependencies"
  mtd: cfi_cmdset_0002: make sector erase command variable
  mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips
  mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode
  mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one
  block2mtd: dubious assignment
  P4080/mtd: Fix the freescale lbc issue with 36bit mode
  P4080/eLBC: Make Freescale elbc interrupt common to elbc devices
  mtd: phram: use KBUILD_MODNAME
  mtd: OneNAND: S5PC110: Fix double call suspend & resume function
  mtd: nand: fix MTD_MODE_RAW writes
  jffs2: use kmemdup
  mtd: sm_ftl: cosmetic, use bool when possible
  mtd: r852: remove useless pci powerup/down from suspend/resume routines
  mtd: blktrans: fix a race vs kthread_stop
  mtd: blktrans: kill BKL
  mtd: allow to unload the mtdtrans module if its block devices aren't open
  ...

Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2010-10-30T11:35:11+00:00

Conflicts:
	drivers/mtd/mtd_blkdevs.c

Merge Grant's device-tree bits so that we can apply the subsequent fixes.

Signed-off-by: David Woodhouse

convert get_sb_mtd() users to ->mount()

2010-10-29T08:16:26+00:00

Signed-off-by: Al Viro

new helper: ihold()

2010-10-26T01:26:11+00:00

Clones an existing reference to inode; caller must already hold one.

Signed-off-by: Al Viro

jffs2: use kmemdup

2010-10-25T00:33:15+00:00

Convert a sequence of kmalloc and memcpy to use kmemdup.

The semantic patch that performs this transformation is:
(http://coccinelle.lip6.fr/)

// 
@@
expression a,flag,len;
expression arg,e1,e2;
statement S;
@@

  a =
-  \(kmalloc\|kzalloc\)(len,flag)
+  kmemdup(arg,len,flag)
  <... when != a
  if (a == NULL || ...) S
  ...>
- memcpy(a,arg,len+1);
// 

Signed-off-by: Julia Lawall 
Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse

jffs2: Reduce excessive scan of empty blocks

2010-10-25T00:12:20+00:00

Scanning 1024 bytes to see if an EB is empty is a bit much.
Lower it to 256 bytes and make sure the while loop is
optimized.

Signed-off-by: Joakim Tjernlund 
Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse

jffs2: Fix serious write stall due to erase

2010-10-25T00:06:22+00:00

Drop the alloc_sem before erasing flash in
jffs2_garbage_collect_pass().
Otherwise writes are put on hold until the erase
has finised.

Signed-off-by: Joakim Tjernlund 
Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse

jffs2: Dynamically choose inocache hash size

2010-10-24T23:57:19+00:00

When JFFS2 is used for large volumes, the mount times are quite long.
Increasing the hash size provides a significant speed boost on the OLPC
XO-1 laptop.

Add logic that dynamically selects a hash size based on the size of
the medium. A 64mb medium will result in a hash size of 128, and a 512mb
medium will result in a hash size of 1024.

Signed-off-by: Daniel Drake 
Signed-off-by: David Woodhouse

jffs2: drop unused model argument

2010-10-24T23:49:11+00:00

The jffs2 compression framework provides a "model" argument when
compressing and decompressing, but the caller always passes in NULL
and the callees never use it.  So punt this useless overhead.

Signed-off-by: Mike Frysinger 
Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse

jffs2: use cond_resched() instead of yield()

2010-10-24T23:14:01+00:00

yield() has different semantics meanwhile and even causes RT-kernels to
BUG. Replace the only appearance left in jffs2.

Signed-off-by: Wolfram Sang 
Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse