]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'for-linus' of git://github.com/prasad-joshi/logfs_upstream
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Jan 2012 17:23:59 +0000 (09:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Jan 2012 17:23:59 +0000 (09:23 -0800)
commit3b0fe6f127ac8a12a6c44323b3df9dd20b4353c3
treed72aaaa845fb81c669093363a0a1cc6d9e96baf2
parente11287899fd73a161a1039df00206fa9c4089492
parenta5f9cd683f096ba088506090d30ffba2c08597aa
Merge tag 'for-linus' of git://github.com/prasad-joshi/logfs_upstream

There are few important bug fixes for LogFS

* tag 'for-linus' of git://github.com/prasad-joshi/logfs_upstream:
  Logfs: Allow NULL block_isbad() methods
  logfs: Grow inode in delete path
  logfs: Free areas before calling generic_shutdown_super()
  logfs: remove useless BUG_ON
  MAINTAINERS: Add Prasad Joshi in LogFS maintiners
  logfs: Propagate page parameter to __logfs_write_inode
  logfs: set superblock shutdown flag after generic sb shutdown
  logfs: take write mutex lock during fsync and sync
  logfs: Prevent memory corruption
  logfs: update page reference count for pined pages

Fix up conflict in fs/logfs/dev_mtd.c due to semantic change in what
"mtd->block_isbad" means in commit a5f9cd683f09: "Logfs: Allow NULL
block_isbad() methods" clashing with the abstraction changes in the
commits 57bba86b1988: "mtd: introduce mtd_block_isbad interface" and
9271be33bc7f: "logfs: do not use 'mtd->block_isbad' directly".

This resolution takes the semantics from commit a5f9cd683f09, and just
makes mtd_block_isbad() return zero (false) if the 'block_isbad'
function is NULL.  But that also means that now "mtd_can_have_bb()"
always returns 0.

Now, "mtd_block_markbad()" will obviously return an error if the
low-level driver doesn't support bad blocks, so this is somewhat
non-symmetric, but it actually makes sense if a NULL "block_isbad"
function is considered to mean "I assume that all my blocks are always
good".
MAINTAINERS
fs/logfs/dir.c
fs/logfs/inode.c
fs/logfs/logfs.h
include/linux/mtd/mtd.h