aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph/super.c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-05-22 06:01:14 -0400
committerSage Weil <sage@newdream.net>2010-05-29 12:12:41 -0400
commit7e34bc524ecae3a04d8cc427ee76ddad826a937b (patch)
tree5065eb0e287e450aef2d8e03e3a18d8f895a4c9e /fs/ceph/super.c
parenta41359fa355e7b450c610ed8e913d5d75c3c9c3b (diff)
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: Julia Lawall <julia@diku.dk> Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/super.c')
-rw-r--r--fs/ceph/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index bac13898b94..9b46bb951e1 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -738,7 +738,7 @@ static struct dentry *open_root_dentry(struct ceph_client *client,
738 dout("open_root_inode opening '%s'\n", path); 738 dout("open_root_inode opening '%s'\n", path);
739 req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_GETATTR, USE_ANY_MDS); 739 req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_GETATTR, USE_ANY_MDS);
740 if (IS_ERR(req)) 740 if (IS_ERR(req))
741 return ERR_PTR(PTR_ERR(req)); 741 return ERR_CAST(req);
742 req->r_path1 = kstrdup(path, GFP_NOFS); 742 req->r_path1 = kstrdup(path, GFP_NOFS);
743 req->r_ino1.ino = CEPH_INO_ROOT; 743 req->r_ino1.ino = CEPH_INO_ROOT;
744 req->r_ino1.snap = CEPH_NOSNAP; 744 req->r_ino1.snap = CEPH_NOSNAP;