X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=fs%2Fext4%2Fnamei.c;h=437f71fe83ae557ad36af1092026aba6d58ccbc6;hp=6a6b90363ef1b2344c053d0a751a4c8a5989cde2;hb=c140f8b072d16595c83d4d16a05693e72d9b1973;hpb=eb6984fa4ce2837dcb1f66720a600f31b0bb3739;ds=sidebyside

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 6a6b90363ef1..437f71fe83ae 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1557,7 +1557,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi
 
 	bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL);
 	if (IS_ERR(bh))
-		return (struct dentry *) bh;
+		return ERR_CAST(bh);
 	inode = NULL;
 	if (bh) {
 		__u32 ino = le32_to_cpu(de->inode);
@@ -1601,7 +1601,7 @@ struct dentry *ext4_get_parent(struct dentry *child)
 
 	bh = ext4_find_entry(d_inode(child), &dotdot, &de, NULL);
 	if (IS_ERR(bh))
-		return (struct dentry *) bh;
+		return ERR_CAST(bh);
 	if (!bh)
 		return ERR_PTR(-ENOENT);
 	ino = le32_to_cpu(de->inode);