diff --git a/[refs] b/[refs]
index 1fb981bd6556..65368fcf9dec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 888a214dc4c65e1486ef7d3ac6b0cf93ae3cc2c7
+refs/heads/master: 2ccd4f4d4737b37e21dd92c8c584c23cd87740a2
diff --git a/trunk/fs/pipe.c b/trunk/fs/pipe.c
index f0e485d54e64..a932ced92a16 100644
--- a/trunk/fs/pipe.c
+++ b/trunk/fs/pipe.c
@@ -1137,7 +1137,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
 	if (nr_pages < pipe->nrbufs)
 		return -EBUSY;
 
-	bufs = kcalloc(nr_pages, sizeof(struct pipe_buffer), GFP_KERNEL);
+	bufs = kcalloc(nr_pages, sizeof(*bufs), GFP_KERNEL | __GFP_NOWARN);
 	if (unlikely(!bufs))
 		return -ENOMEM;