| commit | 8c68face5548cdecb770d75ad44a74aec9352d10 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 08 15:51:01 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 08 15:51:01 2014 -0700 |
| tree | 9d6b4f8032f7ee8d19817ad9d332844794ba506c | |
| parent | 861b7102b58ea55e171e503c2163efd60a4cc052 [diff] | |
| parent | a9cfcd63e8d206ce4235c355d857c4fbdf0f4587 [diff] |
Merge branch 'for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 Pull ext4 bugfix from Ted Ts'o. [ Hmm. It's possible we should make kfree() aware of error pointers, and use IS_ERR_OR_NULL rather than a NULL check. But in the meantime this is obviously the right fix. - Linus ] * 'for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: avoid trying to kfree an ERR_PTR pointer