Subject: [merged] bfs-iget_locked-doesnt-return-an-err_ptr.patch removed from -mm tree To: dan.carpenter@xxxxxxxxxx,tigran@xxxxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 26 Aug 2013 13:08:10 -0700 The patch titled Subject: bfs: iget_locked() doesn't return an ERR_PTR has been removed from the -mm tree. Its filename was bfs-iget_locked-doesnt-return-an-err_ptr.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Subject: bfs: iget_locked() doesn't return an ERR_PTR iget_locked() returns a NULL on error, it doesn't return an ERR_PTR. Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Cc: "Tigran A. Aivazian" <tigran@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/bfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/bfs/inode.c~bfs-iget_locked-doesnt-return-an-err_ptr fs/bfs/inode.c --- a/fs/bfs/inode.c~bfs-iget_locked-doesnt-return-an-err_ptr +++ a/fs/bfs/inode.c @@ -40,7 +40,7 @@ struct inode *bfs_iget(struct super_bloc int block, off; inode = iget_locked(sb, ino); - if (IS_ERR(inode)) + if (!inode) return ERR_PTR(-ENOMEM); if (!(inode->i_state & I_NEW)) return inode; _ Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are linux-next.patch ocfs2-use-list_for_each_entry-instead-of-list_for_each.patch ocfs2-use-list_for_each_entry-instead-of-list_for_each-fix.patch mbind-add-bug_onvma-in-new_vma_page.patch affs-use-loff_t-in-affs_truncate.patch pktcdvd-convert-printk-to-pr_level.patch pktcdvd-fix-defective-misuses-of-pkt_level.patch fs-convert-fs-shrinkers-to-new-scan-count-api-fix-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html