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

Commit 7e34bc52 authored by Julia Lawall's avatar Julia Lawall Committed by Sage Weil
Browse files

fs/ceph: 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.

In the case of fs/ceph/inode.c, ERR_CAST is not needed, because the type of
the returned value is the same as the type of the enclosing function.

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 avatarSage Weil <sage@newdream.net>
parent a41359fa

fs/ceph/dir.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -587,7 +587,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry, 
		CEPH_MDS_OP_LOOKUPSNAP : CEPH_MDS_OP_LOOKUP;

		CEPH_MDS_OP_LOOKUPSNAP : CEPH_MDS_OP_LOOKUP;

	req = ceph_mdsc_create_request(mdsc, op, USE_ANY_MDS);

	req = ceph_mdsc_create_request(mdsc, op, USE_ANY_MDS);

	if (IS_ERR(req))

	if (IS_ERR(req))

		return ERR_PTR(PTR_ERR(req));

		return ERR_CAST(req);

	req->r_dentry = dget(dentry);

	req->r_dentry = dget(dentry);

	req->r_num_caps = 2;

	req->r_num_caps = 2;

	/* we only need inode linkage */

	/* we only need inode linkage */

fs/ceph/export.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -133,7 +133,7 @@ static struct dentry *__cfh_to_dentry(struct super_block *sb, 
		req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_LOOKUPHASH,

		req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_LOOKUPHASH,

					       USE_ANY_MDS);

					       USE_ANY_MDS);

		if (IS_ERR(req))

		if (IS_ERR(req))

			return ERR_PTR(PTR_ERR(req));

			return ERR_CAST(req);





		req->r_ino1 = vino;

		req->r_ino1 = vino;

		req->r_ino2.ino = cfh->parent_ino;

		req->r_ino2.ino = cfh->parent_ino;

fs/ceph/file.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry, 
	/* do the open */

	/* do the open */

	req = prepare_open_request(dir->i_sb, flags, mode);

	req = prepare_open_request(dir->i_sb, flags, mode);

	if (IS_ERR(req))

	if (IS_ERR(req))

		return ERR_PTR(PTR_ERR(req));

		return ERR_CAST(req);

	req->r_dentry = dget(dentry);

	req->r_dentry = dget(dentry);

	req->r_num_caps = 2;

	req->r_num_caps = 2;

	if (flags & O_CREAT) {

	if (flags & O_CREAT) {

fs/ceph/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ struct inode *ceph_get_snapdir(struct inode *parent) 




	BUG_ON(!S_ISDIR(parent->i_mode));

	BUG_ON(!S_ISDIR(parent->i_mode));

	if (IS_ERR(inode))

	if (IS_ERR(inode))

		return ERR_PTR(PTR_ERR(inode));

		return inode;

	inode->i_mode = parent->i_mode;

	inode->i_mode = parent->i_mode;

	inode->i_uid = parent->i_uid;

	inode->i_uid = parent->i_uid;

	inode->i_gid = parent->i_gid;

	inode->i_gid = parent->i_gid;

fs/ceph/osdmap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -706,7 +706,7 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, 
		     len, *p, end);

		     len, *p, end);

		newcrush = crush_decode(*p, min(*p+len, end));

		newcrush = crush_decode(*p, min(*p+len, end));

		if (IS_ERR(newcrush))

		if (IS_ERR(newcrush))

			return ERR_PTR(PTR_ERR(newcrush));

			return ERR_CAST(newcrush);

	}

	}





	/* new flags? */

	/* new flags? */