Linus Torvalds d3712b9dfc Pull request from git://github.com/prasad-joshi/logfs_upstream.git ... There are few important bug fixes for LogFS Shortlog: Joern Engel (5): logfs: Prevent memory corruption logfs: remove useless BUG_ON logfs: Free areas before calling generic_shutdown_super() logfs: Grow inode in delete path Logfs: Allow NULL block_isbad() methods Prasad Joshi (5): logfs: update page reference count for pined pages logfs: take write mutex lock during fsync and sync logfs: set superblock shutdown flag after generic sb shutdown logfs: Propagate page parameter to __logfs_write_inode MAINTAINERS: Add Prasad Joshi in LogFS maintiners Diffstat: MAINTAINERS | 1 + fs/logfs/dev_mtd.c | 26 +++++++++++------------- fs/logfs/dir.c | 2 +- fs/logfs/file.c | 2 + fs/logfs/gc.c | 2 +- fs/logfs/inode.c | 4 ++- fs/logfs/journal.c | 1 - fs/logfs/logfs.h | 5 +++- fs/logfs/readwrite.c | 51 +++++++++++++++++++++++++++++++++---------------- fs/logfs/segment.c | 51 ++++++++++++++++++++++++++++++++++++++----------- fs/logfs/super.c | 3 +- 11 files changed, 99 insertions(+), 49 deletions(-) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPKByhAAoJEDFA/f+3K+ZNQSUP/3gACcIwcsl+FnXPWBtz9XIG g0DjXoRDd/sR0u25nLgjCVdBJgx5FVEyA+PvLgvvUU2KCAsqI5F/EQ+fLJs21YEN TzepBO5aHtFZbNEjo6WiXOlDbBePTtk44WrN6jqoCHM/aDeT4Wof3NZBmHWNN1PX B2RtEZ0ypJ7/b1OY2LUNcQfTaJXNgVoP8Hkx4KGY5LUVxVrBXxvDTU7YbkS8a+ys 1Yje/EQ4XD4RyZB42TmFEuTenvGPRgMGVFdnkJKuON8EmJQ8Hc61jEf5d7Q8sWef dH5F/ptoAaR9a9LbbO8LoYuBZ8MR8848NPsrNPpr/gWntj46Z79yII8Jr7YoSDyw zq5G2dZbwlbVrtVWKGae47THkNB8bljR/g4cijvPAkvuIAku6mg+dgjVHAhZ/t+J xu8+Gy2sWHUH2gmoSXuoNyppOvYpPIRd5RB16PizMH3bw+sMad2K8/rfOKnmF1/r HTM2jZ5bDcHVDjSuVI6u2m/mQX+PmPXUTffreaFXuSI75YpT0dqN3nponTX4EgFI Ad9ZBQvdg8w1LGDsNxIAaqrGx4Q87RxqfUV4W/wo6N8gKsp+I2y4GtYMeD/CEKyi wncKg10YwoMXZj7cBAkWgPlgrOBYCPwYZc/1DVRHvqrHo/m13SJrWDKkNKVvoXzH 2y4Tfi5w1WDRUT7yeoyK =TA1A -----END PGP SIGNATURE----- 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 f2933e86ad: "Logfs: Allow NULL block_isbad() methods" clashing with the abstraction changes in the commits 7086c19d07: "mtd: introduce mtd_block_isbad interface" and d58b27ed58: "logfs: do not use 'mtd->block_isbad' directly". This resolution takes the semantics from commit f2933e86ad, 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".		2012-01-31 09:23:59 -08:00
..
bbm.h	mtd: nand: improve comment on NAND_BBT_DYNAMIC_STRUCT	2011-09-11 15:01:57 +03:00
blktrans.h
cfi_endian.h	mtd: cfi: Allow per-mapping CFI device endianness	2012-01-09 18:06:13 +00:00
cfi.h	mtd: cfi: Allow per-mapping CFI device endianness	2012-01-09 18:06:13 +00:00
concat.h
doc2000.h
flashchip.h
fsmc.h
ftl.h
gen_probe.h
gpmi-nand.h	mtd: fix compile error for gpmi-nand	2011-12-23 21:33:15 +05:30
inftl.h
latch-addr-flash.h
map.h	mtd: map.h: fix arm cross-build failure	2012-01-09 18:24:34 +00:00
mtd.h	Pull request from git://github.com/prasad-joshi/logfs_upstream.git	2012-01-31 09:23:59 -08:00
mtdram.h
nand_bch.h
nand_ecc.h
nand-gpio.h
nand.h	mtd: nand: add Macronix manufacturer	2012-01-09 17:59:33 +00:00
ndfc.h
nftl.h
onenand_regs.h
onenand.h	mtd: OneNAND: Detect the correct NOP when 4KiB pagesize	2011-09-11 15:02:13 +03:00
partitions.h	mtd: remove put_partition_parser() from public header	2011-09-11 15:02:13 +03:00
pfow.h
physmap.h	mtd: maps: physmap: allow partition parsers for physmap_flash_data	2012-01-09 18:16:15 +00:00
pismo.h
plat-ram.h
pmc551.h
qinfo.h
sh_flctl.h
sharpsl.h
super.h
ubi.h	UBI: clarify the volume notification types' doc	2011-06-23 17:40:07 +03:00
xip.h