02 May, 2008
4 commits
-
* git://git.infradead.org/mtd-2.6:
[MTD][NOR] Add physical address to point() method
[JFFS2] Track parent inode for directories (for NFS export)
[JFFS2] Invert last argument of jffs2_gc_fetch_inode(), make it boolean.
[JFFS2] Quiet lockdep false positive.
[JFFS2] Clean up jffs2_alloc_inode() and jffs2_i_init_once()
[MTD] Delete long-unused jedec.h header file.
[MTD] [NAND] at91_nand: use at91_nand_{en,dis}able consistently. -
Adding the ability to get a physical address from point() in addition
to virtual address. This physical address is required for XIP of
userspace code from flash.Signed-off-by: Jared Hulbert
Reviewed-by: Jörn Engel
Acked-by: Nicolas Pitre
Acked-by: Greg Ungerer
Signed-off-by: David Woodhouse -
To support NFS export, we need to know the parent inode of directories.
Rather than growing the jffs2_inode_cache structure, share space with
the nlink field -- which was always set to 1 for directories anyway.Signed-off-by: David Woodhouse
-
We don't actually care about nlink; we only care whether the inode in
question is unlinked or not.Signed-off-by: David Woodhouse
01 May, 2008
2 commits
-
Don't hold f->sem while calling into jffs2_do_create(). It makes lockdep
unhappy, and we don't really need it -- the _reason_ it's a false
positive is because nobody else can see this inode yet and so nobody
will be trying to lock it anyway.Signed-off-by: David Woodhouse
-
Ditch a couple of pointless casts from void *, and use the normal
variable name 'f' for jffs2_inode_info pointers -- especially since
it actually shows up in lockdep reports.Signed-off-by: David Woodhouse
30 Apr, 2008
1 commit
-
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
23 Apr, 2008
9 commits
-
We haven't seen bugs in this for a while now, since the rewrite. No need
to be _quite_ so verbose...Signed-off-by: David Woodhouse
-
When _all_ the blocks were on the erase_pending_list, we could't find a
block to GC from but there was no _actually_ free space, and
jffs2_reserve_space() would get a little unhappy.Handle this case by returning -EAGAIN from jffs2_garbage_collect_pass().
There are two callers of that function -- jffs2_flush_wbuf_gc(), which
will interpret it as an error and flush the writebuffer by other means,
and jffs2_reserve_space(), which we modify to respond to -EAGAIN with an
immediate call to jffs2_erase_pending_blocks() and another run round the
loop.Signed-off-by: David Woodhouse
-
Just to keep the debug code happy when it's adding all the blocks up.
Otherwise, they disappear for a while while the locks are dropped to
check them and write the cleanmarker.Signed-off-by: David Woodhouse
-
It looks the error paths in jffs2_block_check_erase() have wrong return
values. A block that failed to be erased never gets marked as bad.Signed-off-by: David Woodhouse
-
Haven't had any complaints about it recently, despite having the test
code enabled to verify that the calculated length is correct.Kill it off, just by #undef TEST_TOTLEN for now; removing it for real
can come a little later.Signed-off-by: David Woodhouse
-
Signed-off-by: David Woodhouse
-
The problem fixed in commit 014b164e1392a166fe96e003d2f0e7ad2e2a0bb7
(space leak with in-band cleanmarkers) would have been caught a lot
quicker if our paranoid debugging mode had included adding up the size
counts from all the eraseblocks and comparing the totals with the counts
in the superblock. Add that.Make jffs2_mark_erased_block() file the newly-erased block on the
free_list before calling the debug function, to make it happy.Signed-off-by: David Woodhouse
-
We were accounting for the cleanmarker by calling jffs2_link_node_ref()
(without locking!), which adjusted both superblock and per-eraseblock
accounting, subtracting the size of the cleanmarker from {jeb,c}->free_size
and adding it to {jeb,c}->used_size.But only _then_ were we adding the size of the newly-erased block back
to the superblock counts, and we were adding each of jeb->{free,used}_size
to the corresponding superblock counts. Thus, the size of the cleanmarker
was effectively subtracted from the superblock's free_size _twice_.Fix this, by always adding a full eraseblock size to c->free_size when
we've erased a block. And call jffs2_link_node_ref() under the proper
lock, while we're at it.Thanks to Alexander Yurchenko and/or Damir Shayhutdinov for (almost)
pinpointing the problem.Signed-off-by: David Woodhouse
-
... instead of which we don't need any more anyway.
Signed-off-by: David Woodhouse
22 Apr, 2008
7 commits
-
Signed-off-by: David Woodhouse
-
Add the write verification buffer to the dataflash. The mtd_dataflash has
the CONFIG_DATAFLASH_WRITE_VERIFY so is better a change to Kconfig.Signed-off-by: Michael Trimarchi
Signed-off-by: Andrew Morton
Signed-off-by: David Woodhouse -
fs/jffs2/gc.c:1147:29: warning: symbol 'jeb' shadows an earlier one
fs/jffs2/gc.c:1084:89: originally declared here
fs/jffs2/gc.c:1197:29: warning: symbol 'jeb' shadows an earlier one
fs/jffs2/gc.c:1084:89: originally declared hereRename the unused 'jeb' argument to avoid this. We could potentially
remove the argument, but GCC should be doing that anyway.Signed-off-by: David Woodhouse
-
fs/jffs2/write.c:585:28: warning: symbol 'fd' shadows an earlier one
fs/jffs2/write.c:536:27: originally declared hereNo need to redeclare fd, use the original one, after this point,
fd is always reassigned before it used again.Signed-off-by: Harvey Harrison
Signed-off-by: Andrew Morton
Signed-off-by: David Woodhouse -
fs/jffs2/nodemgmt.c:60:8: warning: symbol 'ret' shadows an earlier one
fs/jffs2/nodemgmt.c:45:6: originally declared here(reported by Harvey Harrison)
Just remove the offending declaration of 'int ret' and use the earlier one.
Signed-off-by: David Woodhouse
-
fs/jffs2/ioctl.c:14:5: warning: symbol 'jffs2_ioctl' was not declared.
Signed-off-by: Harvey Harrison
Signed-off-by: Andrew Morton
Signed-off-by: David Woodhouse
19 Apr, 2008
1 commit
-
Signed-off-by: Matthew Wilcox
15 Apr, 2008
1 commit
-
This fixes a regression introduced in commit
205c109a7a96d9a3d8ffe64c4068b70811fef5e8 when switching to
write_begin/write_end operations in JFFS2.The page offset is miscalculated, leading to corruption of the fragment
lists and subsequently to memory corruption and panics.[ Side note: the bug is a fairly direct result of the naming. Nick was
likely misled by the use of "offs", since we tend to use the notion of
"offset" not as an absolute position, but as an offset _within_ a page
or allocation.Alternatively, a "pgoff_t" is a page index, but not a byte offset -
our VM naming can be a bit confusing.So in this case, a VM person would likely have called this a "pos",
not an "offs", or perhaps talked about byte offsets rather than page
offsets (since it's counted in bytes, not pages). - Linus ]Signed-off-by: Alexey Korolev
Signed-off-by: Vasiliy Leonenko
Signed-off-by: David Woodhouse
Signed-off-by: Linus Torvalds
25 Feb, 2008
2 commits
-
This is going to obsolete all previous nodes, so treat it as deletion.
Signed-off-by: David Woodhouse
-
Addresses OLPC trac #6480
Signed-off-by: David Woodhouse
08 Feb, 2008
3 commits
-
* git://git.infradead.org/mtd-2.6: (120 commits)
[MTD] Fix mtdoops.c compilation
[MTD] [NOR] fix startup lock when using multiple nor flash chips
[MTD] [DOC200x] eccbuf is statically defined and always evaluate to true
[MTD] Fix maps/physmap.c compilation with CONFIG_PM
[MTD] onenand: Add panic_write function to the onenand driver
[MTD] mtdoops: Use the panic_write function when present
[MTD] Add mtd panic_write function pointer
[MTD] [NAND] Freescale enhanced Local Bus Controller FCM NAND support.
[MTD] physmap.c: Add support for multiple resources
[MTD] [NAND] Fix misparenthesization introduced by commit 78b65179...
[MTD] [NAND] Fix Blackfin NFC ECC calculating bug with page size 512 bytes
[MTD] [NAND] Remove wrong operation in PM function of the BF54x NFC driver
[MTD] [NAND] Remove unused variable in plat_nand_remove
[MTD] Unlocking all Intel flash that is locked on power up.
[MTD] [NAND] at91_nand: Make mtdparts option can override board info
[MTD] mtdoops: Various minor cleanups
[MTD] mtdoops: Ensure sequential write to the buffer
[MTD] mtdoops: Perform write operations in a workqueue
[MTD] mtdoops: Add further error return code checking
[MTD] [NOR] Test devtype, not definition in flash_probe(), drivers/mtd/devices/lart.c
... -
Stop the JFFS2 filesystem from using iget() and read_inode(). Replace
jffs2_read_inode() with jffs2_iget(), and call that instead of iget().
jffs2_iget() then uses iget_locked() directly and returns a proper error code
instead of an inode in the event of an error.jffs2_do_fill_super() returns any error incurred when getting the root inode
instead of EINVAL.Signed-off-by: David Howells
Cc: David Woodhouse
Acked-by: Christoph Hellwig
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Convert instances of ERR_PTR(PTR_ERR(p)) to ERR_CAST(p) using:
perl -spi -e 's/ERR_PTR[(]PTR_ERR[(](.*)[)][)]/ERR_CAST(\1)/' `grep -rl 'ERR_PTR[(]*PTR_ERR' fs crypto net security`
Signed-off-by: David Howells
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
03 Feb, 2008
2 commits
-
Signed-off-by: Robert P. J. Day
Signed-off-by: Adrian Bunk
08 Jan, 2008
1 commit
-
posix_acl_clone does a memory allocation and sets a reference count, so
posix_acl_release is needed afterwards to free it.The problem was fixed using the following semantic patch.
(http://www.emn.fr/x-info/coccinelle/)//
@@
type T;
identifier E;
expression E1, E2;
int ret;
statement S;
@@T E;
//Signed-off-by: Julia Lawall
Acked-by: KaiGai Kohei
Signed-off-by: David Woodhouse
04 Dec, 2007
1 commit
-
Fix breakage caused by commit d5d8c5976d6adeddb8208c240460411e2198b393
"freezer: do not send signals to kernel threads" in
jffs2_garbage_collect_thread() that assumed it would be sent signals
by the freezer.Signed-off-by: Rafael J. Wysocki
Cc: David Woodhouse
Cc: Pete MacKay
Signed-off-by: Len Brown
28 Nov, 2007
1 commit
-
If we ask it to map 'len' bytes of the device, don't compare against
some other number and whine that it's different. That's a little silly.Signed-off-by: Alexey Korolev
Signed-off-by: David Woodhouse
22 Nov, 2007
1 commit
-
We were failing to check the data CRC on data nodes on non-writebuffered
flash, which led to "interesting" behaviour on unclean shutdowns.Signed-off-by: David Woodhouse
06 Nov, 2007
2 commits
-
jffs2_get_acl() can now become static again.
Signed-off-by: Adrian Bunk
Acked-by: KaiGai Kohei
Signed-off-by: Andrew Morton
Signed-off-by: David Woodhouse -
Somehow, the patch in commit 15953580e79b58caefb107e77f218e009b9992e6
was misapplied and part of the old list-traversal remained. Remove it.Signed-off-by: Andrew Morton
Signed-off-by: David Woodhouse
02 Nov, 2007
2 commits
-
dwmw2: anyway, removing sgid from directories or from
files without S_IXGRP is a plain and simple bug
these days you don't need that logics at all - simply remove itSigned-off-by: David Woodhouse
-
Commit a491486a2087ac3dfc00efb4f838c8d684afaf54 started obliterating
dirents directly on the medium, when jffs2_can_mark_obsolete(). Removing
them immediately from the f->dents list, however, screws up handling of
f_pos within a directory -- because the offset is equivalent to the
number of entries through the list we are, and the existence of
deletion dirents served to provide 'placeholders' for unlinked
entries. Now, 'rm -r' doesn't even manage to unlink everything in the
directory.Revert to keeping 'deletion' dirents in the list, at least in memory
even though we no longer write anything to the medium.Spotted, debugged and mostly fixed by Joakim Tjernlund
Signed-off-by: David Woodhouse