public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] ocfs2 fixes for 2.6.36.
@ 2010-09-07 23:41 Joel Becker
  2010-09-08  2:19 ` Linus Torvalds
  0 siblings, 1 reply; 3+ messages in thread
From: Joel Becker @ 2010-09-07 23:41 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Mark Fasheh, tao.ma, Andrew Morton, linux-kernel, ocfs2-devel

Linus et al,
	Here are the ocfs2 fixes we have ready for pulling right now.  I
have a bit of a procedural question, though.  I've been busy, so Tao was
kind enough to take the fixes I already had and apply all the new fixes.
He coordinated testing them and getting them ready to go upstream.
That's why I have his git tree in the pull request below.
	I wasn't sure how the signoffs work for this.  He's got signoffs
on the stuff he put together, because it's coming through his tree.  My
naive assumption is that this is the correct way to go.  If you'd like
another arrangement (same branch in my tree, a merge commit somewhere to
stick my SoB on, etc), let me know.
	Otherwise, please pull.

Joel


The following changes since commit 2bfc96a127bc1cc94d26bfaa40159966064f9c8c:
  Linus Torvalds (1):
        Linux 2.6.36-rc3

are available in the git repository at:

  git://oss.oracle.com/git/tma/linux-2.6.git fixes

Jan Kara (2):
      ocfs2: Flush drive's caches on fdatasync
      ocfs2: Fix deadlock when allocating page

Mark Fasheh (6):
      ocfs2: properly set and use inode group alloc hint
      ocfs2: split out inode alloc code from ocfs2_mknod_locked
      ocfs2: use ocfs2_alloc_dinode_update_counts() instead of open coding
      ocfs2: allow return of new inode block location before allocation of the inode
      ocfs2: split out ocfs2_prepare_orphan_dir() into locking and prep functions
      ocfs2: Fix orphan add in ocfs2_create_inode_in_orphan

Sunil Mushran (2):
      ocfs2: Fix metaecc error messages
      ocfs2: Fix incorrect checksum validation error

Tao Ma (2):
      ocfs2: make __ocfs2_page_mkwrite handle file end properly.
      ocfs2: Use the right group in nfs sync check.

Tristan Ye (1):
      Ocfs2: Fix a regression bug from mainline commit(6b933c8e6f1a2f3118082c455eef25f9b1ac7b45).

 fs/ocfs2/alloc.c        |    2 +-
 fs/ocfs2/blockcheck.c   |    4 +-
 fs/ocfs2/file.c         |   15 ++-
 fs/ocfs2/inode.c        |    6 +-
 fs/ocfs2/mmap.c         |    8 +-
 fs/ocfs2/namei.c        |  302 ++++++++++++++++++++++++++++++++++++-----------
 fs/ocfs2/refcounttree.c |    5 +-
 fs/ocfs2/suballoc.c     |  219 ++++++++++++++++++++++++++++++----
 fs/ocfs2/suballoc.h     |   21 ++++
 9 files changed, 475 insertions(+), 107 deletions(-)

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-09-08  6:50 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-07 23:41 [GIT PULL] ocfs2 fixes for 2.6.36 Joel Becker
2010-09-08  2:19 ` Linus Torvalds
2010-09-08  6:48   ` Tao Ma

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox