Merge branch 'cleanups-for-4.1-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1

2015-03-25 10:43:16 -07:00
parent bc465aa9d0 258ece0212
commit 9deed229fa
21 changed files with 126 additions and 135 deletions
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -470,7 +470,7 @@ again:
 	 */
 	if (inode_need_compress(inode)) {
 		WARN_ON(pages);
-		pages = kzalloc(sizeof(struct page *) * nr_pages, GFP_NOFS);
+		pages = kcalloc(nr_pages, sizeof(struct page *), GFP_NOFS);
 		if (!pages) {
 			/* just bail out to the uncompressed code */
 			goto cont;