UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

coda: remove struct coda_sb_info 

The sb_info structure only contains a single pointer to the character device,
there is no need for the added indirection.

Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jan Harkes 2007-07-19 01:48:50 -07:00 committed by Linus Torvalds
parent 5fd31e9a67
commit a1b0aa8764
4 changed files with 49 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/coda/cache.c
View File

@ -49,11 +49,6 @@ void coda_cache_clear_inode(struct inode *inode)
/* remove all acl caches */ /* remove all acl caches */
void coda_cache_clear_all(struct super_block *sb) void coda_cache_clear_all(struct super_block *sb)
{ {
struct coda_sb_info *sbi;
sbi = coda_sbp(sb);
BUG_ON(!sbi);
atomic_inc(&permission_epoch); atomic_inc(&permission_epoch);
} }

32
fs/coda/inode.c
View File

@ -141,11 +141,10 @@ static int get_device_index(struct coda_mount_data *data)
static int coda_fill_super(struct super_block *sb, void *data, int silent) static int coda_fill_super(struct super_block *sb, void *data, int silent)
{ {
struct inode *root = NULL; struct inode *root = NULL;
struct coda_sb_info *sbi = NULL;
struct venus_comm *vc = NULL; struct venus_comm *vc = NULL;
struct CodaFid fid; struct CodaFid fid;
int error; int error;
int idx; int idx;
idx = get_device_index((struct coda_mount_data *) data); idx = get_device_index((struct coda_mount_data *) data);
@ -167,16 +166,9 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
return -EBUSY; return -EBUSY;
} }
sbi = kmalloc(sizeof(struct coda_sb_info), GFP_KERNEL);
if(!sbi) {
return -ENOMEM;
}
vc->vc_sb = sb; vc->vc_sb = sb;
sbi->sbi_vcomm = vc; sb->s_fs_info = vc;
sb->s_fs_info = sbi;
sb->s_flags |= MS_NOATIME; sb->s_flags |= MS_NOATIME;
sb->s_blocksize = 4096; /* XXXXX what do we put here?? */ sb->s_blocksize = 4096; /* XXXXX what do we put here?? */
sb->s_blocksize_bits = 12; sb->s_blocksize_bits = 12;
@ -207,26 +199,20 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
return 0; return 0;
error: error:
if (sbi) {
kfree(sbi);
if(vc)
vc->vc_sb = NULL;
}
if (root) if (root)
iput(root); iput(root);
if (vc)
vc->vc_sb = NULL;
return -EINVAL; return -EINVAL;
} }
static void coda_put_super(struct super_block *sb) static void coda_put_super(struct super_block *sb)
{ {
struct coda_sb_info *sbi; coda_vcp(sb)->vc_sb = NULL;
sb->s_fs_info = NULL;
sbi = coda_sbp(sb);
sbi->sbi_vcomm->vc_sb = NULL;
printk("Coda: Bye bye.\n"); printk("Coda: Bye bye.\n");
kfree(sbi);
} }
static void coda_clear_inode(struct inode *inode) static void coda_clear_inode(struct inode *inode)

79
fs/coda/upcall.c
View File

@ -37,7 +37,7 @@
#include <linux/coda_cache.h> #include <linux/coda_cache.h>
#include <linux/coda_proc.h> #include <linux/coda_proc.h>
static int coda_upcall(struct coda_sb_info *mntinfo, int inSize, int *outSize, static int coda_upcall(struct venus_comm *vc, int inSize, int *outSize,
union inputArgs *buffer); union inputArgs *buffer);
static void *alloc_upcall(int opcode, int size) static void *alloc_upcall(int opcode, int size)
@ -83,7 +83,7 @@ int venus_rootfid(struct super_block *sb, struct CodaFid *fidp)
insize = SIZE(root); insize = SIZE(root);
UPARG(CODA_ROOT); UPARG(CODA_ROOT);
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
if (!error) if (!error)
*fidp = outp->coda_root.VFid; *fidp = outp->coda_root.VFid;
@ -102,7 +102,7 @@ int venus_getattr(struct super_block *sb, struct CodaFid *fid,
UPARG(CODA_GETATTR); UPARG(CODA_GETATTR);
inp->coda_getattr.VFid = *fid; inp->coda_getattr.VFid = *fid;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
if (!error) if (!error)
*attr = outp->coda_getattr.attr; *attr = outp->coda_getattr.attr;
@ -123,7 +123,7 @@ int venus_setattr(struct super_block *sb, struct CodaFid *fid,
inp->coda_setattr.VFid = *fid; inp->coda_setattr.VFid = *fid;
inp->coda_setattr.attr = *vattr; inp->coda_setattr.attr = *vattr;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -149,7 +149,7 @@ int venus_lookup(struct super_block *sb, struct CodaFid *fid,
memcpy((char *)(inp) + offset, name, length); memcpy((char *)(inp) + offset, name, length);
*((char *)inp + offset + length) = '\0'; *((char *)inp + offset + length) = '\0';
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
if (!error) { if (!error) {
*resfid = outp->coda_lookup.VFid; *resfid = outp->coda_lookup.VFid;
*type = outp->coda_lookup.vtype; *type = outp->coda_lookup.vtype;
@ -182,7 +182,7 @@ int venus_store(struct super_block *sb, struct CodaFid *fid, int flags,
inp->coda_store.VFid = *fid; inp->coda_store.VFid = *fid;
inp->coda_store.flags = flags; inp->coda_store.flags = flags;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -200,7 +200,7 @@ int venus_release(struct super_block *sb, struct CodaFid *fid, int flags)
inp->coda_release.VFid = *fid; inp->coda_release.VFid = *fid;
inp->coda_release.flags = flags; inp->coda_release.flags = flags;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -229,7 +229,7 @@ int venus_close(struct super_block *sb, struct CodaFid *fid, int flags,
inp->coda_close.VFid = *fid; inp->coda_close.VFid = *fid;
inp->coda_close.flags = flags; inp->coda_close.flags = flags;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -248,7 +248,7 @@ int venus_open(struct super_block *sb, struct CodaFid *fid,
inp->coda_open_by_fd.VFid = *fid; inp->coda_open_by_fd.VFid = *fid;
inp->coda_open_by_fd.flags = flags; inp->coda_open_by_fd.flags = flags;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
if (!error) if (!error)
*fh = outp->coda_open_by_fd.fh; *fh = outp->coda_open_by_fd.fh;
@ -276,7 +276,7 @@ int venus_mkdir(struct super_block *sb, struct CodaFid *dirfid,
memcpy((char *)(inp) + offset, name, length); memcpy((char *)(inp) + offset, name, length);
*((char *)inp + offset + length) = '\0'; *((char *)inp + offset + length) = '\0';
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
if (!error) { if (!error) {
*attrs = outp->coda_mkdir.attr; *attrs = outp->coda_mkdir.attr;
*newfid = outp->coda_mkdir.VFid; *newfid = outp->coda_mkdir.VFid;
@ -318,7 +318,7 @@ int venus_rename(struct super_block *sb, struct CodaFid *old_fid,
memcpy((char *)(inp) + offset, new_name, new_length); memcpy((char *)(inp) + offset, new_name, new_length);
*((char *)inp + offset + new_length) = '\0'; *((char *)inp + offset + new_length) = '\0';
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -347,7 +347,7 @@ int venus_create(struct super_block *sb, struct CodaFid *dirfid,
memcpy((char *)(inp) + offset, name, length); memcpy((char *)(inp) + offset, name, length);
*((char *)inp + offset + length) = '\0'; *((char *)inp + offset + length) = '\0';
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
if (!error) { if (!error) {
*attrs = outp->coda_create.attr; *attrs = outp->coda_create.attr;
*newfid = outp->coda_create.VFid; *newfid = outp->coda_create.VFid;
@ -373,8 +373,8 @@ int venus_rmdir(struct super_block *sb, struct CodaFid *dirfid,
inp->coda_rmdir.name = offset; inp->coda_rmdir.name = offset;
memcpy((char *)(inp) + offset, name, length); memcpy((char *)(inp) + offset, name, length);
*((char *)inp + offset + length) = '\0'; *((char *)inp + offset + length) = '\0';
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -395,8 +395,8 @@ int venus_remove(struct super_block *sb, struct CodaFid *dirfid,
inp->coda_remove.name = offset; inp->coda_remove.name = offset;
memcpy((char *)(inp) + offset, name, length); memcpy((char *)(inp) + offset, name, length);
*((char *)inp + offset + length) = '\0'; *((char *)inp + offset + length) = '\0';
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -417,7 +417,7 @@ int venus_readlink(struct super_block *sb, struct CodaFid *fid,
inp->coda_readlink.VFid = *fid; inp->coda_readlink.VFid = *fid;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
if (!error) { if (!error) {
retlen = outp->coda_readlink.count; retlen = outp->coda_readlink.count;
if ( retlen > *length ) if ( retlen > *length )
@ -453,8 +453,8 @@ int venus_link(struct super_block *sb, struct CodaFid *fid,
/* make sure strings are null terminated */ /* make sure strings are null terminated */
memcpy((char *)(inp) + offset, name, len); memcpy((char *)(inp) + offset, name, len);
*((char *)inp + offset + len) = '\0'; *((char *)inp + offset + len) = '\0';
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -489,7 +489,7 @@ int venus_symlink(struct super_block *sb, struct CodaFid *fid,
memcpy((char *)(inp) + offset, name, len); memcpy((char *)(inp) + offset, name, len);
*((char *)inp + offset + len) = '\0'; *((char *)inp + offset + len) = '\0';
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -504,9 +504,9 @@ int venus_fsync(struct super_block *sb, struct CodaFid *fid)
insize=SIZE(fsync); insize=SIZE(fsync);
UPARG(CODA_FSYNC); UPARG(CODA_FSYNC);
inp->coda_fsync.VFid = *fid; inp->coda_fsync.VFid = *fid;
error = coda_upcall(coda_sbp(sb), sizeof(union inputArgs), error = coda_upcall(coda_vcp(sb), sizeof(union inputArgs),
&outsize, inp); &outsize, inp);
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -524,7 +524,7 @@ int venus_access(struct super_block *sb, struct CodaFid *fid, int mask)
inp->coda_access.VFid = *fid; inp->coda_access.VFid = *fid;
inp->coda_access.flags = mask; inp->coda_access.flags = mask;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -573,9 +573,9 @@ int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
goto exit; goto exit;
} }
error = coda_upcall(coda_sbp(sb), SIZE(ioctl) + data->vi.in_size, error = coda_upcall(coda_vcp(sb), SIZE(ioctl) + data->vi.in_size,
&outsize, inp); &outsize, inp);
if (error) { if (error) {
printk("coda_pioctl: Venus returns: %d for %s\n", printk("coda_pioctl: Venus returns: %d for %s\n",
error, coda_f2s(fid)); error, coda_f2s(fid));
@ -615,7 +615,7 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs)
insize = max_t(unsigned int, INSIZE(statfs), OUTSIZE(statfs)); insize = max_t(unsigned int, INSIZE(statfs), OUTSIZE(statfs));
UPARG(CODA_STATFS); UPARG(CODA_STATFS);
error = coda_upcall(coda_sbp(dentry->d_sb), insize, &outsize, inp); error = coda_upcall(coda_vcp(dentry->d_sb), insize, &outsize, inp);
if (!error) { if (!error) {
sfs->f_blocks = outp->coda_statfs.stat.f_blocks; sfs->f_blocks = outp->coda_statfs.stat.f_blocks;
sfs->f_bfree = outp->coda_statfs.stat.f_bfree; sfs->f_bfree = outp->coda_statfs.stat.f_bfree;
@ -710,28 +710,25 @@ static inline void coda_waitfor_upcall(struct upc_req *req)
} }
/* /*
* coda_upcall will return an error in the case of * coda_upcall will return an error in the case of
* failed communication with Venus _or_ will peek at Venus * failed communication with Venus _or_ will peek at Venus
* reply and return Venus' error. * reply and return Venus' error.
* *
* As venus has 2 types of errors, normal errors (positive) and internal * As venus has 2 types of errors, normal errors (positive) and internal
* errors (negative), normal errors are negated, while internal errors * errors (negative), normal errors are negated, while internal errors
* are all mapped to -EINTR, while showing a nice warning message. (jh) * are all mapped to -EINTR, while showing a nice warning message. (jh)
*
*/ */
static int coda_upcall(struct coda_sb_info *sbi, static int coda_upcall(struct venus_comm *vcp,
int inSize, int *outSize, int inSize, int *outSize,
union inputArgs *buffer) union inputArgs *buffer)
{ {
struct venus_comm *vcommp;
union outputArgs *out; union outputArgs *out;
union inputArgs *sig_inputArgs; union inputArgs *sig_inputArgs;
struct upc_req *req, *sig_req; struct upc_req *req, *sig_req;
int error = 0; int error = 0;
vcommp = sbi->sbi_vcomm; if (!vcp->vc_inuse) {
if (!vcommp->vc_inuse) {
printk(KERN_NOTICE "coda: Venus dead, not sending upcall\n"); printk(KERN_NOTICE "coda: Venus dead, not sending upcall\n");
return -ENXIO; return -ENXIO;
} }
@ -746,16 +743,16 @@ static int coda_upcall(struct coda_sb_info *sbi,
req->uc_inSize = inSize; req->uc_inSize = inSize;
req->uc_outSize = *outSize ? *outSize : inSize; req->uc_outSize = *outSize ? *outSize : inSize;
req->uc_opcode = ((union inputArgs *)buffer)->ih.opcode; req->uc_opcode = ((union inputArgs *)buffer)->ih.opcode;
req->uc_unique = ++vcommp->vc_seq; req->uc_unique = ++vcp->vc_seq;
init_waitqueue_head(&req->uc_sleep); init_waitqueue_head(&req->uc_sleep);
/* Fill in the common input args. */ /* Fill in the common input args. */
((union inputArgs *)buffer)->ih.unique = req->uc_unique; ((union inputArgs *)buffer)->ih.unique = req->uc_unique;
/* Append msg to pending queue and poke Venus. */ /* Append msg to pending queue and poke Venus. */
list_add_tail(&req->uc_chain, &vcommp->vc_pending); list_add_tail(&req->uc_chain, &vcp->vc_pending);
wake_up_interruptible(&vcommp->vc_waitq); wake_up_interruptible(&vcp->vc_waitq);
/* We can be interrupted while we wait for Venus to process /* We can be interrupted while we wait for Venus to process
* our request. If the interrupt occurs before Venus has read * our request. If the interrupt occurs before Venus has read
* the request, we dequeue and return. If it occurs after the * the request, we dequeue and return. If it occurs after the
@ -788,7 +785,7 @@ static int coda_upcall(struct coda_sb_info *sbi,
goto exit; goto exit;
/* Venus saw the upcall, make sure we can send interrupt signal */ /* Venus saw the upcall, make sure we can send interrupt signal */
if (!vcommp->vc_inuse) { if (!vcp->vc_inuse) {
printk(KERN_INFO "coda: Venus dead, not sending signal.\n"); printk(KERN_INFO "coda: Venus dead, not sending signal.\n");
goto exit; goto exit;
} }
@ -815,8 +812,8 @@ static int coda_upcall(struct coda_sb_info *sbi,
sig_req->uc_outSize = sizeof(struct coda_in_hdr); sig_req->uc_outSize = sizeof(struct coda_in_hdr);
/* insert at head of queue! */ /* insert at head of queue! */
list_add(&(sig_req->uc_chain), &vcommp->vc_pending); list_add(&(sig_req->uc_chain), &vcp->vc_pending);
wake_up_interruptible(&vcommp->vc_waitq); wake_up_interruptible(&vcp->vc_waitq);
exit: exit:
kfree(req); kfree(req);

9
include/linux/coda_psdev.h
View File

@ -8,11 +8,6 @@
struct kstatfs; struct kstatfs;
struct coda_sb_info
{
struct venus_comm *sbi_vcomm;
};
/* communication pending/processing queues */ /* communication pending/processing queues */
struct venus_comm { struct venus_comm {
u_long vc_seq; u_long vc_seq;
@ -24,9 +19,9 @@ struct venus_comm {
}; };
static inline struct coda_sb_info *coda_sbp(struct super_block *sb) static inline struct venus_comm *coda_vcp(struct super_block *sb)
{ {
return ((struct coda_sb_info *)((sb)->s_fs_info)); return (struct venus_comm *)((sb)->s_fs_info);
} }