summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-03 09:56:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-03 09:56:25 -0700
commit14a9e5c09d13aa36b88ea54b8b6134b60ff2a410 (patch)
tree4c8c477d4e459bd3429b83a81e3db531ffe32969 /include/linux
parent8546dc1d4b671480961c3eaf4c0c102ae6848340 (diff)
parentfb1c2d8294a60184a151ff12182446d7b930ed95 (diff)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext3/jbd fixes from Jan Kara: "A couple of ext3/jbd fixes" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: jbd: use kmem_cache_zalloc for allocating journal head jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset jbd: don't wait (forever) for stale tid caused by wraparound ext3: fix data=journal fast mount/umount hang
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/jbd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index c8f32975f0e4..7e0b622503c4 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -887,7 +887,7 @@ extern struct kmem_cache *jbd_handle_cache;
static inline handle_t *jbd_alloc_handle(gfp_t gfp_flags)
{
- return kmem_cache_alloc(jbd_handle_cache, gfp_flags);
+ return kmem_cache_zalloc(jbd_handle_cache, gfp_flags);
}
static inline void jbd_free_handle(handle_t *handle)