]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'fix-max-write' of git://git.kernel.org/pub/scm/linux/kernel/git/teiglan...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Feb 2013 09:50:11 +0000 (20:50 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Feb 2013 09:50:11 +0000 (20:50 +1100)
Pull dlm fix from David Teigland:
 "Thanks to Jana who reported the problem and was able to test this fix
  so quickly."

This fixes an incorrect size check that triggered for CONFIG_COMPAT
whether the code was actually doing compat or not.  The incorrect write
size check broke userland (clvmd) when maximum resource name lengths are
used.

* 'fix-max-write' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: check the write size from user


Trivial merge