Skip to content

Commit e231c2e

Browse files
dhowellsLinus Torvalds
dhowells
authored and
Linus Torvalds
committed
Convert ERR_PTR(PTR_ERR(p)) instances to ERR_CAST(p)
Convert instances of ERR_PTR(PTR_ERR(p)) to ERR_CAST(p) using: perl -spi -e 's/ERR_PTR[(]PTR_ERR[(](.*)[)][)]/ERR_CAST(\1)/' `grep -rl 'ERR_PTR[(]*PTR_ERR' fs crypto net security` Signed-off-by: David Howells <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent d1bc8e9 commit e231c2e

28 files changed

+39
-39
lines changed

‎crypto/cbc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ static struct crypto_instance *crypto_cbc_alloc(struct rtattr **tb)
224224
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
225225
CRYPTO_ALG_TYPE_MASK);
226226
if (IS_ERR(alg))
227-
return ERR_PTR(PTR_ERR(alg));
227+
return ERR_CAST(alg);
228228

229229
inst = ERR_PTR(-EINVAL);
230230
if (!is_power_of_2(alg->cra_blocksize))

‎crypto/cryptd.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ static struct crypto_instance *cryptd_alloc_blkcipher(
230230
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_BLKCIPHER,
231231
CRYPTO_ALG_TYPE_MASK);
232232
if (IS_ERR(alg))
233-
return ERR_PTR(PTR_ERR(alg));
233+
return ERR_CAST(alg);
234234

235235
inst = cryptd_alloc_instance(alg, state);
236236
if (IS_ERR(inst))
@@ -267,7 +267,7 @@ static struct crypto_instance *cryptd_alloc(struct rtattr **tb)
267267

268268
algt = crypto_get_attr_type(tb);
269269
if (IS_ERR(algt))
270-
return ERR_PTR(PTR_ERR(algt));
270+
return ERR_CAST(algt);
271271

272272
switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
273273
case CRYPTO_ALG_TYPE_BLKCIPHER:

‎crypto/ecb.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static struct crypto_instance *crypto_ecb_alloc(struct rtattr **tb)
128128
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
129129
CRYPTO_ALG_TYPE_MASK);
130130
if (IS_ERR(alg))
131-
return ERR_PTR(PTR_ERR(alg));
131+
return ERR_CAST(alg);
132132

133133
inst = crypto_alloc_instance("ecb", alg);
134134
if (IS_ERR(inst))

‎crypto/hmac.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ static struct crypto_instance *hmac_alloc(struct rtattr **tb)
213213
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_HASH,
214214
CRYPTO_ALG_TYPE_HASH_MASK);
215215
if (IS_ERR(alg))
216-
return ERR_PTR(PTR_ERR(alg));
216+
return ERR_CAST(alg);
217217

218218
inst = crypto_alloc_instance("hmac", alg);
219219
if (IS_ERR(inst))

‎crypto/lrw.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ static struct crypto_instance *alloc(struct rtattr **tb)
241241
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
242242
CRYPTO_ALG_TYPE_MASK);
243243
if (IS_ERR(alg))
244-
return ERR_PTR(PTR_ERR(alg));
244+
return ERR_CAST(alg);
245245

246246
inst = crypto_alloc_instance("lrw", alg);
247247
if (IS_ERR(inst))

‎crypto/pcbc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ static struct crypto_instance *crypto_pcbc_alloc(struct rtattr **tb)
234234
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
235235
CRYPTO_ALG_TYPE_MASK);
236236
if (IS_ERR(alg))
237-
return ERR_PTR(PTR_ERR(alg));
237+
return ERR_CAST(alg);
238238

239239
inst = crypto_alloc_instance("pcbc", alg);
240240
if (IS_ERR(inst))

‎crypto/xcbc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ static struct crypto_instance *xcbc_alloc(struct rtattr **tb)
301301
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
302302
CRYPTO_ALG_TYPE_MASK);
303303
if (IS_ERR(alg))
304-
return ERR_PTR(PTR_ERR(alg));
304+
return ERR_CAST(alg);
305305

306306
switch(alg->cra_blocksize) {
307307
case 16:

‎fs/9p/vfs_inode.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ static struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
573573
v9ses = v9fs_inode2v9ses(dir);
574574
dfid = v9fs_fid_lookup(dentry->d_parent);
575575
if (IS_ERR(dfid))
576-
return ERR_PTR(PTR_ERR(dfid));
576+
return ERR_CAST(dfid);
577577

578578
name = (char *) dentry->d_name.name;
579579
fid = p9_client_walk(dfid, 1, &name, 1);

‎fs/affs/namei.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ affs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
209209
bh = affs_find_entry(dir, dentry);
210210
affs_unlock_dir(dir);
211211
if (IS_ERR(bh)) {
212-
return ERR_PTR(PTR_ERR(bh));
212+
return ERR_CAST(bh);
213213
}
214214
if (bh) {
215215
u32 ino = bh->b_blocknr;

‎fs/afs/dir.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
512512
key = afs_request_key(vnode->volume->cell);
513513
if (IS_ERR(key)) {
514514
_leave(" = %ld [key]", PTR_ERR(key));
515-
return ERR_PTR(PTR_ERR(key));
515+
return ERR_CAST(key);
516516
}
517517

518518
ret = afs_validate(vnode, key);
@@ -540,7 +540,7 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
540540
key_put(key);
541541
if (IS_ERR(inode)) {
542542
_leave(" = %ld", PTR_ERR(inode));
543-
return ERR_PTR(PTR_ERR(inode));
543+
return ERR_CAST(inode);
544544
}
545545

546546
dentry->d_op = &afs_fs_dentry_operations;

‎fs/afs/security.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static struct afs_vnode *afs_get_auth_inode(struct afs_vnode *vnode,
9595
auth_inode = afs_iget(vnode->vfs_inode.i_sb, key,
9696
&vnode->status.parent, NULL, NULL);
9797
if (IS_ERR(auth_inode))
98-
return ERR_PTR(PTR_ERR(auth_inode));
98+
return ERR_CAST(auth_inode);
9999
}
100100

101101
auth_vnode = AFS_FS_I(auth_inode);

‎fs/fat/inode.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ static struct dentry *fat_get_parent(struct dentry *child)
760760
inode = fat_build_inode(child->d_sb, de, i_pos);
761761
brelse(bh);
762762
if (IS_ERR(inode)) {
763-
parent = ERR_PTR(PTR_ERR(inode));
763+
parent = ERR_CAST(inode);
764764
goto out;
765765
}
766766
parent = d_alloc_anon(inode);

‎fs/fuse/dir.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,12 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
269269

270270
req = fuse_get_req(fc);
271271
if (IS_ERR(req))
272-
return ERR_PTR(PTR_ERR(req));
272+
return ERR_CAST(req);
273273

274274
forget_req = fuse_get_req(fc);
275275
if (IS_ERR(forget_req)) {
276276
fuse_put_request(fc, req);
277-
return ERR_PTR(PTR_ERR(forget_req));
277+
return ERR_CAST(forget_req);
278278
}
279279

280280
attr_version = fuse_get_attr_version(fc);
@@ -1006,7 +1006,7 @@ static char *read_link(struct dentry *dentry)
10061006
char *link;
10071007

10081008
if (IS_ERR(req))
1009-
return ERR_PTR(PTR_ERR(req));
1009+
return ERR_CAST(req);
10101010

10111011
link = (char *) __get_free_page(GFP_KERNEL);
10121012
if (!link) {

‎fs/gfs2/dir.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@ struct inode *gfs2_dir_search(struct inode *dir, const struct qstr *name)
14981498
dent = gfs2_dirent_search(dir, name, gfs2_dirent_find, &bh);
14991499
if (dent) {
15001500
if (IS_ERR(dent))
1501-
return ERR_PTR(PTR_ERR(dent));
1501+
return ERR_CAST(dent);
15021502
inode = gfs2_inode_lookup(dir->i_sb,
15031503
be16_to_cpu(dent->de_type),
15041504
be64_to_cpu(dent->de_inum.no_addr),

‎fs/gfs2/ops_export.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static struct dentry *gfs2_get_parent(struct dentry *child)
143143
* have to return that as a(n invalid) pointer to dentry.
144144
*/
145145
if (IS_ERR(inode))
146-
return ERR_PTR(PTR_ERR(inode));
146+
return ERR_CAST(inode);
147147

148148
dentry = d_alloc_anon(inode);
149149
if (!dentry) {

‎fs/gfs2/ops_inode.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry,
111111

112112
inode = gfs2_lookupi(dir, &dentry->d_name, 0, nd);
113113
if (inode && IS_ERR(inode))
114-
return ERR_PTR(PTR_ERR(inode));
114+
return ERR_CAST(inode);
115115

116116
if (inode) {
117117
struct gfs2_glock *gl = GFS2_I(inode)->i_gl;

‎fs/jffs2/write.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2
177177
void *hold_err = fn->raw;
178178
/* Release the full_dnode which is now useless, and return */
179179
jffs2_free_full_dnode(fn);
180-
return ERR_PTR(PTR_ERR(hold_err));
180+
return ERR_CAST(hold_err);
181181
}
182182
fn->ofs = je32_to_cpu(ri->offset);
183183
fn->size = je32_to_cpu(ri->dsize);
@@ -313,7 +313,7 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff
313313
void *hold_err = fd->raw;
314314
/* Release the full_dirent which is now useless, and return */
315315
jffs2_free_full_dirent(fd);
316-
return ERR_PTR(PTR_ERR(hold_err));
316+
return ERR_CAST(hold_err);
317317
}
318318

319319
if (retried) {

‎fs/nfs/getroot.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh)
9696
inode = nfs_fhget(sb, mntfh, fsinfo.fattr);
9797
if (IS_ERR(inode)) {
9898
dprintk("nfs_get_root: get root inode failed\n");
99-
return ERR_PTR(PTR_ERR(inode));
99+
return ERR_CAST(inode);
100100
}
101101

102102
error = nfs_superblock_set_dummy_root(sb, inode);
@@ -266,7 +266,7 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh)
266266
inode = nfs_fhget(sb, mntfh, &fattr);
267267
if (IS_ERR(inode)) {
268268
dprintk("nfs_get_root: get root inode failed\n");
269-
return ERR_PTR(PTR_ERR(inode));
269+
return ERR_CAST(inode);
270270
}
271271

272272
error = nfs_superblock_set_dummy_root(sb, inode);

‎fs/nfsd/export.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1218,13 +1218,13 @@ static struct svc_export *exp_find(struct auth_domain *clp, int fsid_type,
12181218
struct svc_export *exp;
12191219
struct svc_expkey *ek = exp_find_key(clp, fsid_type, fsidv, reqp);
12201220
if (IS_ERR(ek))
1221-
return ERR_PTR(PTR_ERR(ek));
1221+
return ERR_CAST(ek);
12221222

12231223
exp = exp_get_by_name(clp, ek->ek_mnt, ek->ek_dentry, reqp);
12241224
cache_put(&ek->h, &svc_expkey_cache);
12251225

12261226
if (IS_ERR(exp))
1227-
return ERR_PTR(PTR_ERR(exp));
1227+
return ERR_CAST(exp);
12281228
return exp;
12291229
}
12301230

‎fs/quota.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -341,11 +341,11 @@ static inline struct super_block *quotactl_block(const char __user *special)
341341
char *tmp = getname(special);
342342

343343
if (IS_ERR(tmp))
344-
return ERR_PTR(PTR_ERR(tmp));
344+
return ERR_CAST(tmp);
345345
bdev = lookup_bdev(tmp);
346346
putname(tmp);
347347
if (IS_ERR(bdev))
348-
return ERR_PTR(PTR_ERR(bdev));
348+
return ERR_CAST(bdev);
349349
sb = get_super(bdev);
350350
bdput(bdev);
351351
if (!sb)

‎fs/reiserfs/inode.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1536,7 +1536,7 @@ static struct dentry *reiserfs_get_dentry(struct super_block *sb,
15361536
if (!inode)
15371537
inode = ERR_PTR(-ESTALE);
15381538
if (IS_ERR(inode))
1539-
return ERR_PTR(PTR_ERR(inode));
1539+
return ERR_CAST(inode);
15401540
result = d_alloc_anon(inode);
15411541
if (!result) {
15421542
iput(inode);

‎fs/reiserfs/xattr.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ static struct dentry *get_xa_file_dentry(const struct inode *inode,
155155

156156
xadir = open_xa_dir(inode, flags);
157157
if (IS_ERR(xadir)) {
158-
return ERR_PTR(PTR_ERR(xadir));
158+
return ERR_CAST(xadir);
159159
} else if (xadir && !xadir->d_inode) {
160160
dput(xadir);
161161
return ERR_PTR(-ENODATA);
@@ -164,7 +164,7 @@ static struct dentry *get_xa_file_dentry(const struct inode *inode,
164164
xafile = lookup_one_len(name, xadir, strlen(name));
165165
if (IS_ERR(xafile)) {
166166
dput(xadir);
167-
return ERR_PTR(PTR_ERR(xafile));
167+
return ERR_CAST(xafile);
168168
}
169169

170170
if (xafile->d_inode) { /* file exists */

‎fs/vfat/namei.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry,
705705
brelse(sinfo.bh);
706706
if (IS_ERR(inode)) {
707707
unlock_kernel();
708-
return ERR_PTR(PTR_ERR(inode));
708+
return ERR_CAST(inode);
709709
}
710710
alias = d_find_alias(inode);
711711
if (alias) {

‎net/rxrpc/af_rxrpc.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ static struct rxrpc_transport *rxrpc_name_to_transport(struct socket *sock,
239239
/* find a remote transport endpoint from the local one */
240240
peer = rxrpc_get_peer(srx, gfp);
241241
if (IS_ERR(peer))
242-
return ERR_PTR(PTR_ERR(peer));
242+
return ERR_CAST(peer);
243243

244244
/* find a transport */
245245
trans = rxrpc_get_transport(rx->local, peer, gfp);
@@ -282,7 +282,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock,
282282
trans = rxrpc_name_to_transport(sock, (struct sockaddr *) srx,
283283
sizeof(*srx), 0, gfp);
284284
if (IS_ERR(trans)) {
285-
call = ERR_PTR(PTR_ERR(trans));
285+
call = ERR_CAST(trans);
286286
trans = NULL;
287287
goto out;
288288
}
@@ -306,7 +306,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock,
306306

307307
bundle = rxrpc_get_bundle(rx, trans, key, service_id, gfp);
308308
if (IS_ERR(bundle)) {
309-
call = ERR_PTR(PTR_ERR(bundle));
309+
call = ERR_CAST(bundle);
310310
goto out;
311311
}
312312

‎security/keys/key.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
820820
key = key_alloc(ktype, description, current->fsuid, current->fsgid,
821821
current, perm, flags);
822822
if (IS_ERR(key)) {
823-
key_ref = ERR_PTR(PTR_ERR(key));
823+
key_ref = ERR_CAST(key);
824824
goto error_3;
825825
}
826826

‎security/keys/process_keys.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ key_ref_t lookup_user_key(struct task_struct *context, key_serial_t id,
660660

661661
key = key_lookup(id);
662662
if (IS_ERR(key)) {
663-
key_ref = ERR_PTR(PTR_ERR(key));
663+
key_ref = ERR_CAST(key);
664664
goto error;
665665
}
666666

‎security/keys/request_key.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ struct key *request_key_and_link(struct key_type *type,
389389
if (!IS_ERR(key_ref)) {
390390
key = key_ref_to_ptr(key_ref);
391391
} else if (PTR_ERR(key_ref) != -EAGAIN) {
392-
key = ERR_PTR(PTR_ERR(key_ref));
392+
key = ERR_CAST(key_ref);
393393
} else {
394394
/* the search failed, but the keyrings were searchable, so we
395395
* should consult userspace if we can */

‎security/keys/request_key_auth.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ struct key *key_get_instantiation_authkey(key_serial_t target_id)
261261
current);
262262

263263
if (IS_ERR(authkey_ref)) {
264-
authkey = ERR_PTR(PTR_ERR(authkey_ref));
264+
authkey = ERR_CAST(authkey_ref);
265265
goto error;
266266
}
267267

0 commit comments

Comments
 (0)