diff --git a/[refs] b/[refs] index 209c24b7bed0..b0d8706ac2ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 225db7d35c33f076115a583abec238a696f4467e +refs/heads/master: a8901d34872dafcafa23efa0865dcecfd4fddf8c diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index db3cc913ee8f..c0fe426d444a 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -40,6 +40,7 @@ #include #include #include +#include #include "ext4_jbd2.h" #include "xattr.h" @@ -3729,8 +3730,7 @@ static int ext4_set_bh_endio(struct buffer_head *bh, struct inode *inode) retry: io_end = ext4_init_io_end(inode, GFP_ATOMIC); if (!io_end) { - if (printk_ratelimit()) - printk(KERN_WARNING "%s: allocation fail\n", __func__); + pr_warning_ratelimited("%s: allocation fail\n", __func__); schedule(); goto retry; }