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 <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
d1bc8e9544
Коммит
e231c2ee64
|
@ -224,7 +224,7 @@ static struct crypto_instance *crypto_cbc_alloc(struct rtattr **tb)
|
|||
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
|
||||
CRYPTO_ALG_TYPE_MASK);
|
||||
if (IS_ERR(alg))
|
||||
return ERR_PTR(PTR_ERR(alg));
|
||||
return ERR_CAST(alg);
|
||||
|
||||
inst = ERR_PTR(-EINVAL);
|
||||
if (!is_power_of_2(alg->cra_blocksize))
|
||||
|
|
|
@ -230,7 +230,7 @@ static struct crypto_instance *cryptd_alloc_blkcipher(
|
|||
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_BLKCIPHER,
|
||||
CRYPTO_ALG_TYPE_MASK);
|
||||
if (IS_ERR(alg))
|
||||
return ERR_PTR(PTR_ERR(alg));
|
||||
return ERR_CAST(alg);
|
||||
|
||||
inst = cryptd_alloc_instance(alg, state);
|
||||
if (IS_ERR(inst))
|
||||
|
@ -267,7 +267,7 @@ static struct crypto_instance *cryptd_alloc(struct rtattr **tb)
|
|||
|
||||
algt = crypto_get_attr_type(tb);
|
||||
if (IS_ERR(algt))
|
||||
return ERR_PTR(PTR_ERR(algt));
|
||||
return ERR_CAST(algt);
|
||||
|
||||
switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
|
||||
case CRYPTO_ALG_TYPE_BLKCIPHER:
|
||||
|
|
|
@ -128,7 +128,7 @@ static struct crypto_instance *crypto_ecb_alloc(struct rtattr **tb)
|
|||
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
|
||||
CRYPTO_ALG_TYPE_MASK);
|
||||
if (IS_ERR(alg))
|
||||
return ERR_PTR(PTR_ERR(alg));
|
||||
return ERR_CAST(alg);
|
||||
|
||||
inst = crypto_alloc_instance("ecb", alg);
|
||||
if (IS_ERR(inst))
|
||||
|
|
|
@ -213,7 +213,7 @@ static struct crypto_instance *hmac_alloc(struct rtattr **tb)
|
|||
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_HASH,
|
||||
CRYPTO_ALG_TYPE_HASH_MASK);
|
||||
if (IS_ERR(alg))
|
||||
return ERR_PTR(PTR_ERR(alg));
|
||||
return ERR_CAST(alg);
|
||||
|
||||
inst = crypto_alloc_instance("hmac", alg);
|
||||
if (IS_ERR(inst))
|
||||
|
|
|
@ -241,7 +241,7 @@ static struct crypto_instance *alloc(struct rtattr **tb)
|
|||
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
|
||||
CRYPTO_ALG_TYPE_MASK);
|
||||
if (IS_ERR(alg))
|
||||
return ERR_PTR(PTR_ERR(alg));
|
||||
return ERR_CAST(alg);
|
||||
|
||||
inst = crypto_alloc_instance("lrw", alg);
|
||||
if (IS_ERR(inst))
|
||||
|
|
|
@ -234,7 +234,7 @@ static struct crypto_instance *crypto_pcbc_alloc(struct rtattr **tb)
|
|||
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
|
||||
CRYPTO_ALG_TYPE_MASK);
|
||||
if (IS_ERR(alg))
|
||||
return ERR_PTR(PTR_ERR(alg));
|
||||
return ERR_CAST(alg);
|
||||
|
||||
inst = crypto_alloc_instance("pcbc", alg);
|
||||
if (IS_ERR(inst))
|
||||
|
|
|
@ -301,7 +301,7 @@ static struct crypto_instance *xcbc_alloc(struct rtattr **tb)
|
|||
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
|
||||
CRYPTO_ALG_TYPE_MASK);
|
||||
if (IS_ERR(alg))
|
||||
return ERR_PTR(PTR_ERR(alg));
|
||||
return ERR_CAST(alg);
|
||||
|
||||
switch(alg->cra_blocksize) {
|
||||
case 16:
|
||||
|
|
|
@ -573,7 +573,7 @@ static struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
|
|||
v9ses = v9fs_inode2v9ses(dir);
|
||||
dfid = v9fs_fid_lookup(dentry->d_parent);
|
||||
if (IS_ERR(dfid))
|
||||
return ERR_PTR(PTR_ERR(dfid));
|
||||
return ERR_CAST(dfid);
|
||||
|
||||
name = (char *) dentry->d_name.name;
|
||||
fid = p9_client_walk(dfid, 1, &name, 1);
|
||||
|
|
|
@ -209,7 +209,7 @@ affs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
|
|||
bh = affs_find_entry(dir, dentry);
|
||||
affs_unlock_dir(dir);
|
||||
if (IS_ERR(bh)) {
|
||||
return ERR_PTR(PTR_ERR(bh));
|
||||
return ERR_CAST(bh);
|
||||
}
|
||||
if (bh) {
|
||||
u32 ino = bh->b_blocknr;
|
||||
|
|
|
@ -512,7 +512,7 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
|
|||
key = afs_request_key(vnode->volume->cell);
|
||||
if (IS_ERR(key)) {
|
||||
_leave(" = %ld [key]", PTR_ERR(key));
|
||||
return ERR_PTR(PTR_ERR(key));
|
||||
return ERR_CAST(key);
|
||||
}
|
||||
|
||||
ret = afs_validate(vnode, key);
|
||||
|
@ -540,7 +540,7 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
|
|||
key_put(key);
|
||||
if (IS_ERR(inode)) {
|
||||
_leave(" = %ld", PTR_ERR(inode));
|
||||
return ERR_PTR(PTR_ERR(inode));
|
||||
return ERR_CAST(inode);
|
||||
}
|
||||
|
||||
dentry->d_op = &afs_fs_dentry_operations;
|
||||
|
|
|
@ -95,7 +95,7 @@ static struct afs_vnode *afs_get_auth_inode(struct afs_vnode *vnode,
|
|||
auth_inode = afs_iget(vnode->vfs_inode.i_sb, key,
|
||||
&vnode->status.parent, NULL, NULL);
|
||||
if (IS_ERR(auth_inode))
|
||||
return ERR_PTR(PTR_ERR(auth_inode));
|
||||
return ERR_CAST(auth_inode);
|
||||
}
|
||||
|
||||
auth_vnode = AFS_FS_I(auth_inode);
|
||||
|
|
|
@ -760,7 +760,7 @@ static struct dentry *fat_get_parent(struct dentry *child)
|
|||
inode = fat_build_inode(child->d_sb, de, i_pos);
|
||||
brelse(bh);
|
||||
if (IS_ERR(inode)) {
|
||||
parent = ERR_PTR(PTR_ERR(inode));
|
||||
parent = ERR_CAST(inode);
|
||||
goto out;
|
||||
}
|
||||
parent = d_alloc_anon(inode);
|
||||
|
|
|
@ -269,12 +269,12 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
|
|||
|
||||
req = fuse_get_req(fc);
|
||||
if (IS_ERR(req))
|
||||
return ERR_PTR(PTR_ERR(req));
|
||||
return ERR_CAST(req);
|
||||
|
||||
forget_req = fuse_get_req(fc);
|
||||
if (IS_ERR(forget_req)) {
|
||||
fuse_put_request(fc, req);
|
||||
return ERR_PTR(PTR_ERR(forget_req));
|
||||
return ERR_CAST(forget_req);
|
||||
}
|
||||
|
||||
attr_version = fuse_get_attr_version(fc);
|
||||
|
@ -1006,7 +1006,7 @@ static char *read_link(struct dentry *dentry)
|
|||
char *link;
|
||||
|
||||
if (IS_ERR(req))
|
||||
return ERR_PTR(PTR_ERR(req));
|
||||
return ERR_CAST(req);
|
||||
|
||||
link = (char *) __get_free_page(GFP_KERNEL);
|
||||
if (!link) {
|
||||
|
|
|
@ -1498,7 +1498,7 @@ struct inode *gfs2_dir_search(struct inode *dir, const struct qstr *name)
|
|||
dent = gfs2_dirent_search(dir, name, gfs2_dirent_find, &bh);
|
||||
if (dent) {
|
||||
if (IS_ERR(dent))
|
||||
return ERR_PTR(PTR_ERR(dent));
|
||||
return ERR_CAST(dent);
|
||||
inode = gfs2_inode_lookup(dir->i_sb,
|
||||
be16_to_cpu(dent->de_type),
|
||||
be64_to_cpu(dent->de_inum.no_addr),
|
||||
|
|
|
@ -143,7 +143,7 @@ static struct dentry *gfs2_get_parent(struct dentry *child)
|
|||
* have to return that as a(n invalid) pointer to dentry.
|
||||
*/
|
||||
if (IS_ERR(inode))
|
||||
return ERR_PTR(PTR_ERR(inode));
|
||||
return ERR_CAST(inode);
|
||||
|
||||
dentry = d_alloc_anon(inode);
|
||||
if (!dentry) {
|
||||
|
|
|
@ -111,7 +111,7 @@ static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry,
|
|||
|
||||
inode = gfs2_lookupi(dir, &dentry->d_name, 0, nd);
|
||||
if (inode && IS_ERR(inode))
|
||||
return ERR_PTR(PTR_ERR(inode));
|
||||
return ERR_CAST(inode);
|
||||
|
||||
if (inode) {
|
||||
struct gfs2_glock *gl = GFS2_I(inode)->i_gl;
|
||||
|
|
|
@ -177,7 +177,7 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2
|
|||
void *hold_err = fn->raw;
|
||||
/* Release the full_dnode which is now useless, and return */
|
||||
jffs2_free_full_dnode(fn);
|
||||
return ERR_PTR(PTR_ERR(hold_err));
|
||||
return ERR_CAST(hold_err);
|
||||
}
|
||||
fn->ofs = je32_to_cpu(ri->offset);
|
||||
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
|
|||
void *hold_err = fd->raw;
|
||||
/* Release the full_dirent which is now useless, and return */
|
||||
jffs2_free_full_dirent(fd);
|
||||
return ERR_PTR(PTR_ERR(hold_err));
|
||||
return ERR_CAST(hold_err);
|
||||
}
|
||||
|
||||
if (retried) {
|
||||
|
|
|
@ -96,7 +96,7 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh)
|
|||
inode = nfs_fhget(sb, mntfh, fsinfo.fattr);
|
||||
if (IS_ERR(inode)) {
|
||||
dprintk("nfs_get_root: get root inode failed\n");
|
||||
return ERR_PTR(PTR_ERR(inode));
|
||||
return ERR_CAST(inode);
|
||||
}
|
||||
|
||||
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)
|
|||
inode = nfs_fhget(sb, mntfh, &fattr);
|
||||
if (IS_ERR(inode)) {
|
||||
dprintk("nfs_get_root: get root inode failed\n");
|
||||
return ERR_PTR(PTR_ERR(inode));
|
||||
return ERR_CAST(inode);
|
||||
}
|
||||
|
||||
error = nfs_superblock_set_dummy_root(sb, inode);
|
||||
|
|
|
@ -1218,13 +1218,13 @@ static struct svc_export *exp_find(struct auth_domain *clp, int fsid_type,
|
|||
struct svc_export *exp;
|
||||
struct svc_expkey *ek = exp_find_key(clp, fsid_type, fsidv, reqp);
|
||||
if (IS_ERR(ek))
|
||||
return ERR_PTR(PTR_ERR(ek));
|
||||
return ERR_CAST(ek);
|
||||
|
||||
exp = exp_get_by_name(clp, ek->ek_mnt, ek->ek_dentry, reqp);
|
||||
cache_put(&ek->h, &svc_expkey_cache);
|
||||
|
||||
if (IS_ERR(exp))
|
||||
return ERR_PTR(PTR_ERR(exp));
|
||||
return ERR_CAST(exp);
|
||||
return exp;
|
||||
}
|
||||
|
||||
|
|
|
@ -341,11 +341,11 @@ static inline struct super_block *quotactl_block(const char __user *special)
|
|||
char *tmp = getname(special);
|
||||
|
||||
if (IS_ERR(tmp))
|
||||
return ERR_PTR(PTR_ERR(tmp));
|
||||
return ERR_CAST(tmp);
|
||||
bdev = lookup_bdev(tmp);
|
||||
putname(tmp);
|
||||
if (IS_ERR(bdev))
|
||||
return ERR_PTR(PTR_ERR(bdev));
|
||||
return ERR_CAST(bdev);
|
||||
sb = get_super(bdev);
|
||||
bdput(bdev);
|
||||
if (!sb)
|
||||
|
|
|
@ -1536,7 +1536,7 @@ static struct dentry *reiserfs_get_dentry(struct super_block *sb,
|
|||
if (!inode)
|
||||
inode = ERR_PTR(-ESTALE);
|
||||
if (IS_ERR(inode))
|
||||
return ERR_PTR(PTR_ERR(inode));
|
||||
return ERR_CAST(inode);
|
||||
result = d_alloc_anon(inode);
|
||||
if (!result) {
|
||||
iput(inode);
|
||||
|
|
|
@ -155,7 +155,7 @@ static struct dentry *get_xa_file_dentry(const struct inode *inode,
|
|||
|
||||
xadir = open_xa_dir(inode, flags);
|
||||
if (IS_ERR(xadir)) {
|
||||
return ERR_PTR(PTR_ERR(xadir));
|
||||
return ERR_CAST(xadir);
|
||||
} else if (xadir && !xadir->d_inode) {
|
||||
dput(xadir);
|
||||
return ERR_PTR(-ENODATA);
|
||||
|
@ -164,7 +164,7 @@ static struct dentry *get_xa_file_dentry(const struct inode *inode,
|
|||
xafile = lookup_one_len(name, xadir, strlen(name));
|
||||
if (IS_ERR(xafile)) {
|
||||
dput(xadir);
|
||||
return ERR_PTR(PTR_ERR(xafile));
|
||||
return ERR_CAST(xafile);
|
||||
}
|
||||
|
||||
if (xafile->d_inode) { /* file exists */
|
||||
|
|
|
@ -705,7 +705,7 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry,
|
|||
brelse(sinfo.bh);
|
||||
if (IS_ERR(inode)) {
|
||||
unlock_kernel();
|
||||
return ERR_PTR(PTR_ERR(inode));
|
||||
return ERR_CAST(inode);
|
||||
}
|
||||
alias = d_find_alias(inode);
|
||||
if (alias) {
|
||||
|
|
|
@ -239,7 +239,7 @@ static struct rxrpc_transport *rxrpc_name_to_transport(struct socket *sock,
|
|||
/* find a remote transport endpoint from the local one */
|
||||
peer = rxrpc_get_peer(srx, gfp);
|
||||
if (IS_ERR(peer))
|
||||
return ERR_PTR(PTR_ERR(peer));
|
||||
return ERR_CAST(peer);
|
||||
|
||||
/* find a transport */
|
||||
trans = rxrpc_get_transport(rx->local, peer, gfp);
|
||||
|
@ -282,7 +282,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock,
|
|||
trans = rxrpc_name_to_transport(sock, (struct sockaddr *) srx,
|
||||
sizeof(*srx), 0, gfp);
|
||||
if (IS_ERR(trans)) {
|
||||
call = ERR_PTR(PTR_ERR(trans));
|
||||
call = ERR_CAST(trans);
|
||||
trans = NULL;
|
||||
goto out;
|
||||
}
|
||||
|
@ -306,7 +306,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock,
|
|||
|
||||
bundle = rxrpc_get_bundle(rx, trans, key, service_id, gfp);
|
||||
if (IS_ERR(bundle)) {
|
||||
call = ERR_PTR(PTR_ERR(bundle));
|
||||
call = ERR_CAST(bundle);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
|
@ -820,7 +820,7 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
|
|||
key = key_alloc(ktype, description, current->fsuid, current->fsgid,
|
||||
current, perm, flags);
|
||||
if (IS_ERR(key)) {
|
||||
key_ref = ERR_PTR(PTR_ERR(key));
|
||||
key_ref = ERR_CAST(key);
|
||||
goto error_3;
|
||||
}
|
||||
|
||||
|
|
|
@ -660,7 +660,7 @@ key_ref_t lookup_user_key(struct task_struct *context, key_serial_t id,
|
|||
|
||||
key = key_lookup(id);
|
||||
if (IS_ERR(key)) {
|
||||
key_ref = ERR_PTR(PTR_ERR(key));
|
||||
key_ref = ERR_CAST(key);
|
||||
goto error;
|
||||
}
|
||||
|
||||
|
|
|
@ -389,7 +389,7 @@ struct key *request_key_and_link(struct key_type *type,
|
|||
if (!IS_ERR(key_ref)) {
|
||||
key = key_ref_to_ptr(key_ref);
|
||||
} else if (PTR_ERR(key_ref) != -EAGAIN) {
|
||||
key = ERR_PTR(PTR_ERR(key_ref));
|
||||
key = ERR_CAST(key_ref);
|
||||
} else {
|
||||
/* the search failed, but the keyrings were searchable, so we
|
||||
* should consult userspace if we can */
|
||||
|
|
|
@ -261,7 +261,7 @@ struct key *key_get_instantiation_authkey(key_serial_t target_id)
|
|||
current);
|
||||
|
||||
if (IS_ERR(authkey_ref)) {
|
||||
authkey = ERR_PTR(PTR_ERR(authkey_ref));
|
||||
authkey = ERR_CAST(authkey_ref);
|
||||
goto error;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче