Subject: [merged] efs-iget_locked-doesnt-return-an-err_ptr.patch removed from -mm tree To: dan.carpenter@xxxxxxxxxx,ebiederm@xxxxxxxxxxxx,serge.hallyn@xxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 26 Aug 2013 13:08:06 -0700 The patch titled Subject: efs: iget_locked() doesn't return an ERR_PTR() has been removed from the -mm tree. Its filename was efs-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: efs: iget_locked() doesn't return an ERR_PTR() The iget_locked() function returns NULL on error and never an ERR_PTR. Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Acked-by: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx> Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/efs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/efs/inode.c~efs-iget_locked-doesnt-return-an-err_ptr fs/efs/inode.c --- a/fs/efs/inode.c~efs-iget_locked-doesnt-return-an-err_ptr +++ a/fs/efs/inode.c @@ -57,7 +57,7 @@ struct inode *efs_iget(struct super_bloc struct inode *inode; inode = iget_locked(super, 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