Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cccad8f9 authored by Julia Lawall's avatar Julia Lawall Committed by Linus Torvalds
Browse files

fs/affs: use ERR_CAST 

Use ERR_CAST(x) rather than ERR_PTR(PTR_ERR(x)).  The former makes more
clear what is the purpose of the operation, which otherwise looks like a
no-op.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@@
type T;
T x;
identifier f;
@@

T f (...) { <+...
- ERR_PTR(PTR_ERR(x))
+ x
 ...+> }

@@
expression x;
@@

- ERR_PTR(PTR_ERR(x))
+ ERR_CAST(x)
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2fd74e25

fs/affs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ affs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) 
		affs_brelse(bh);

		inode = affs_iget(sb, ino);

		if (IS_ERR(inode))

			return ERR_PTR(PTR_ERR(inode));

			return ERR_CAST(inode);

	}

	dentry->d_op = AFFS_SB(sb)->s_flags & SF_INTL ? &affs_intl_dentry_operations : &affs_dentry_operations;

	d_add(dentry, inode);