[folded-merged] fs-affs-make-export-work-with-cold-dcache-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: fs/affs: fix return value check in affs_get_parent()
has been removed from the -mm tree.  Its filename was
     fs-affs-make-export-work-with-cold-dcache-fix.patch

This patch was dropped because it was folded into fs-affs-make-export-work-with-cold-dcache.patch

------------------------------------------------------
From: Wei Yongjun <weiyongjun1@xxxxxxxxxx>
Subject: fs/affs: fix return value check in affs_get_parent()

In case of error, the function affs_bread() returns NULL pointer not
ERR_PTR().  The IS_ERR() test in the return value check should be replaced
with NULL test.

Fixes: e393e82a7d09 ("fs/affs: make export work with cold dcache")
Link: http://lkml.kernel.org/r/20170123141018.2331-1-weiyj.lk@xxxxxxxxx
Signed-off-by: Wei Yongjun <weiyongjun1@xxxxxxxxxx>
Cc: Fabian Frederick <fabf@xxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/affs/namei.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN fs/affs/namei.c~fs-affs-make-export-work-with-cold-dcache-fix fs/affs/namei.c
--- a/fs/affs/namei.c~fs-affs-make-export-work-with-cold-dcache-fix
+++ a/fs/affs/namei.c
@@ -453,8 +453,8 @@ static struct dentry *affs_get_parent(st
 	struct buffer_head *bh;
 
 	bh = affs_bread(child->d_sb, d_inode(child)->i_ino);
-	if (IS_ERR(bh))
-		return ERR_CAST(bh);
+	if (!bh)
+		return ERR_PTR(-EIO);
 
 	parent = affs_iget(child->d_sb,
 			   be32_to_cpu(AFFS_TAIL(child->d_sb, bh)->parent));
_

Patches currently in -mm which might be from weiyongjun1@xxxxxxxxxx are

fs-affs-make-export-work-with-cold-dcache.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



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux