Skip to contentSkip to conversation

Please pull logfs tree for fixes

DISCUSSION Jörn Engel 2 participants 2 messages May 17, 2010

lore
Share & tools
lore
#0 lore raw

Linus,

this should have made it into 2.6.34 - except that I was on vacation last week and decided not to send a pull request right before hanging out the "gone fishing" sign. Whether that was a wise decision, I'm no longer so sure.

If such a situation reappears in the future, would you rather have the fixes and mindlessly revert them in case of any trouble or wait until the respective maintainer reappers?

Jörn

Signature · 44 lines
Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are,
by definition, not smart enough to debug it.
-- Brian W. Kernighan


The following changes since commit 79dba2eaa771c3173957eccfd288e0e0d12e4d3f:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../jbarnes/pci-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git master

Dan Carpenter (2):
      logfs: testing the wrong variable
      logfs: handle errors from get_mtd_device()

Joern Engel (10):
      LogFS: Fix typo in b6349ac8
      logfs: Return -EINVAL if filesystem image doesn't match
      logfs: fix logfs_seek_hole()
      logfs: Close i_ino reuse race
      logfs: survive logfs_buf_recover read errors
      logfs: commit reservations under space pressure
      logfs: fix compile failure
      logfs: fix sync
      logfs: remove unused variable
      logfs: handle powerfail on NAND flash

Prasad Joshi (1):
      logfs: initialize li->li_refcount

 fs/logfs/dev_bdev.c  |    6 ++++++
 fs/logfs/dev_mtd.c   |   26 +++++++++++++++++++++++++-
 fs/logfs/file.c      |   16 ++++++++++++----
 fs/logfs/gc.c        |   49 +++++++++++++++++++++----------------------------
 fs/logfs/inode.c     |    6 +++---
 fs/logfs/journal.c   |    7 +++----
 fs/logfs/logfs.h     |   13 ++++++++-----
 fs/logfs/readwrite.c |   19 +++++++++++++++----
 fs/logfs/segment.c   |    7 +++++--
 fs/logfs/super.c     |    8 ++++++--
 10 files changed, 104 insertions(+), 53 deletions(-)
#1 lore raw
Quoted 4 lines · Jörn Engel

If such a situation reappears in the future, would you rather have the fixes and mindlessly revert them in case of any trouble or wait until the respective maintainer reappers?

Hmm. I think I'm happier this way. If there is something really critical for 2.6.34, you can always send it to stable.

Linus