[GIT PULL] ocfs2 important fix for $next_version-rc1

[Joel Becker]

Linus et al,
	Mea culpa.  The online defrag code in the ocfs2 feature pull had
a naked 64-bit divide that I missed in eyeballing and we all missed in
testing.  None of us managed to build the sucker on 32bit in the past
two months.  That's on me.  Thank you to akpm for noticing.  Also
included is a bugfix in the defrag location guessing.
	I'd really like to get this in before -rc1 so that ocfs2 builds
aren't broken there.  Please pull.

Mr Egg-on-his-face (Joel)

The following changes since commit a74b81b0aff4a01e0816df5915c854fb52c5e87f:

  Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 (2011-05-26 10:55:15 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git linux-next

Joel Becker (1):
      Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window

Tristan Ye (2):
      Ocfs2/move_extents: Avoid doing division in extent moving.
      Ocfs2/move_extents: Validate moving goal after the adjustment.

 fs/ocfs2/move_extents.c |   41 ++++++++++++++++++++---------------------
 1 files changed, 20 insertions(+), 21 deletions(-)

-- 

"Sometimes one pays most for the things one gets for nothing."
        - Albert Einstein

			http://www.jlbec.org/
			jlbec@xxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/