lkml.org 
[lkml]   [2018]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/7 linux-next] coda: remove CODA_FREE
Date
Since commit 1d5cfdb07628
("tree wide: use kvfree() than conditional kfree()/vfree()")
size in CODA_FREE is no longer used and that macro
hides nothing more than kvfree()

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
fs/coda/coda_linux.h | 2 --
fs/coda/psdev.c | 8 ++++----
fs/coda/upcall.c | 36 ++++++++++++++++++------------------
3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/fs/coda/coda_linux.h b/fs/coda/coda_linux.h
index 126155c..903f2a3 100644
--- a/fs/coda/coda_linux.h
+++ b/fs/coda/coda_linux.h
@@ -73,8 +73,6 @@ void coda_sysctl_clean(void);
} while (0)


-#define CODA_FREE(ptr, size) kvfree((ptr))
-
/* inode to cnode access functions */

static inline struct coda_inode_info *ITOC(struct inode *inode)
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index c5234c2..cbdddf4 100644
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -126,7 +126,7 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
}
CODA_ALLOC(dcbuf, union outputArgs *, nbytes);
if (copy_from_user(dcbuf, buf, nbytes)) {
- CODA_FREE(dcbuf, nbytes);
+ kvfree(dcbuf);
retval = -EFAULT;
goto out;
}
@@ -134,7 +134,7 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
/* what downcall errors does Venus handle ? */
error = coda_downcall(vcp, hdr.opcode, dcbuf);

- CODA_FREE(dcbuf, nbytes);
+ kvfree(dcbuf);
if (error) {
pr_warn("%s: coda_downcall error: %d\n",
__func__, error);
@@ -257,7 +257,7 @@ static ssize_t coda_psdev_read(struct file * file, char __user * buf,
goto out;
}

- CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr));
+ kvfree(req->uc_data);
kfree(req);
out:
mutex_unlock(&vcp->vc_mutex);
@@ -319,7 +319,7 @@ static int coda_psdev_release(struct inode * inode, struct file * file)

/* Async requests need to be freed here */
if (req->uc_flags & CODA_REQ_ASYNC) {
- CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr));
+ kvfree(req->uc_data);
kfree(req);
continue;
}
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index 1175a17..d0d0fed 100644
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -85,7 +85,7 @@ int venus_rootfid(struct super_block *sb, struct CodaFid *fidp)
if (!error)
*fidp = outp->coda_root.VFid;

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -104,7 +104,7 @@ int venus_getattr(struct super_block *sb, struct CodaFid *fid,
if (!error)
*attr = outp->coda_getattr.attr;

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -123,7 +123,7 @@ int venus_setattr(struct super_block *sb, struct CodaFid *fid,

error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -153,7 +153,7 @@ int venus_lookup(struct super_block *sb, struct CodaFid *fid,
*type = outp->coda_lookup.vtype;
}

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -173,7 +173,7 @@ int venus_close(struct super_block *sb, struct CodaFid *fid, int flags,

error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -194,7 +194,7 @@ int venus_open(struct super_block *sb, struct CodaFid *fid,
if (!error)
*fh = outp->coda_open_by_fd.fh;

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -224,7 +224,7 @@ int venus_mkdir(struct super_block *sb, struct CodaFid *dirfid,
*newfid = outp->coda_mkdir.VFid;
}

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -262,7 +262,7 @@ int venus_rename(struct super_block *sb, struct CodaFid *old_fid,

error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -295,7 +295,7 @@ int venus_create(struct super_block *sb, struct CodaFid *dirfid,
*newfid = outp->coda_create.VFid;
}

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -318,7 +318,7 @@ int venus_rmdir(struct super_block *sb, struct CodaFid *dirfid,

error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -340,7 +340,7 @@ int venus_remove(struct super_block *sb, struct CodaFid *dirfid,

error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -370,7 +370,7 @@ int venus_readlink(struct super_block *sb, struct CodaFid *fid,
*(buffer + retlen) = '\0';
}

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -398,7 +398,7 @@ int venus_link(struct super_block *sb, struct CodaFid *fid,

error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -433,7 +433,7 @@ int venus_symlink(struct super_block *sb, struct CodaFid *fid,

error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -449,7 +449,7 @@ int venus_fsync(struct super_block *sb, struct CodaFid *fid)
inp->coda_fsync.VFid = *fid;
error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -467,7 +467,7 @@ int venus_access(struct super_block *sb, struct CodaFid *fid, int mask)

error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -543,7 +543,7 @@ int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
}

exit:
- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

@@ -565,7 +565,7 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs)
sfs->f_ffree = outp->coda_statfs.stat.f_ffree;
}

- CODA_FREE(inp, insize);
+ kvfree(inp);
return error;
}

--
2.4.11
\
 
 \ /
  Last update: 2018-10-19 10:21    [W:0.064 / U:0.904 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site