Commit 6383bdaa authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Linus Torvalds
Browse files

[PATCH] fuse: miscellaneous cleanup



 - remove some unneeded assignments

 - use kzalloc instead of kmalloc + memset

 - simplify setting sb->s_fs_info

 - in fuse_send_init() use fuse_get_request() instead of
   do_get_request() helper
Signed-off-by: default avatarMiklos Szeredi <miklos@szeredi.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8bfc016d
...@@ -361,8 +361,8 @@ void request_send_background(struct fuse_conn *fc, struct fuse_req *req) ...@@ -361,8 +361,8 @@ void request_send_background(struct fuse_conn *fc, struct fuse_req *req)
void fuse_send_init(struct fuse_conn *fc) void fuse_send_init(struct fuse_conn *fc)
{ {
/* This is called from fuse_read_super() so there's guaranteed /* This is called from fuse_read_super() so there's guaranteed
to be a request available */ to be exactly one request available */
struct fuse_req *req = do_get_request(fc); struct fuse_req *req = fuse_get_request(fc);
struct fuse_init_in *arg = &req->misc.init_in; struct fuse_init_in *arg = &req->misc.init_in;
arg->major = FUSE_KERNEL_VERSION; arg->major = FUSE_KERNEL_VERSION;
arg->minor = FUSE_KERNEL_MINOR_VERSION; arg->minor = FUSE_KERNEL_MINOR_VERSION;
......
...@@ -280,14 +280,9 @@ struct fuse_conn { ...@@ -280,14 +280,9 @@ struct fuse_conn {
struct backing_dev_info bdi; struct backing_dev_info bdi;
}; };
static inline struct fuse_conn **get_fuse_conn_super_p(struct super_block *sb)
{
return (struct fuse_conn **) &sb->s_fs_info;
}
static inline struct fuse_conn *get_fuse_conn_super(struct super_block *sb) static inline struct fuse_conn *get_fuse_conn_super(struct super_block *sb)
{ {
return *get_fuse_conn_super_p(sb); return sb->s_fs_info;
} }
static inline struct fuse_conn *get_fuse_conn(struct inode *inode) static inline struct fuse_conn *get_fuse_conn(struct inode *inode)
......
...@@ -200,9 +200,6 @@ static void fuse_put_super(struct super_block *sb) ...@@ -200,9 +200,6 @@ static void fuse_put_super(struct super_block *sb)
spin_lock(&fuse_lock); spin_lock(&fuse_lock);
fc->mounted = 0; fc->mounted = 0;
fc->user_id = 0;
fc->group_id = 0;
fc->flags = 0;
/* Flush all readers on this fs */ /* Flush all readers on this fs */
wake_up_all(&fc->waitq); wake_up_all(&fc->waitq);
up_write(&fc->sbput_sem); up_write(&fc->sbput_sem);
...@@ -379,16 +376,15 @@ static struct fuse_conn *new_conn(void) ...@@ -379,16 +376,15 @@ static struct fuse_conn *new_conn(void)
{ {
struct fuse_conn *fc; struct fuse_conn *fc;
fc = kmalloc(sizeof(*fc), GFP_KERNEL); fc = kzalloc(sizeof(*fc), GFP_KERNEL);
if (fc != NULL) { if (fc != NULL) {
int i; int i;
memset(fc, 0, sizeof(*fc));
init_waitqueue_head(&fc->waitq); init_waitqueue_head(&fc->waitq);
INIT_LIST_HEAD(&fc->pending); INIT_LIST_HEAD(&fc->pending);
INIT_LIST_HEAD(&fc->processing); INIT_LIST_HEAD(&fc->processing);
INIT_LIST_HEAD(&fc->unused_list); INIT_LIST_HEAD(&fc->unused_list);
INIT_LIST_HEAD(&fc->background); INIT_LIST_HEAD(&fc->background);
sema_init(&fc->outstanding_sem, 0); sema_init(&fc->outstanding_sem, 1); /* One for INIT */
init_rwsem(&fc->sbput_sem); init_rwsem(&fc->sbput_sem);
for (i = 0; i < FUSE_MAX_OUTSTANDING; i++) { for (i = 0; i < FUSE_MAX_OUTSTANDING; i++) {
struct fuse_req *req = fuse_request_alloc(); struct fuse_req *req = fuse_request_alloc();
...@@ -420,7 +416,7 @@ static struct fuse_conn *get_conn(struct file *file, struct super_block *sb) ...@@ -420,7 +416,7 @@ static struct fuse_conn *get_conn(struct file *file, struct super_block *sb)
fc = ERR_PTR(-EINVAL); fc = ERR_PTR(-EINVAL);
} else { } else {
file->private_data = fc; file->private_data = fc;
*get_fuse_conn_super_p(sb) = fc; sb->s_fs_info = fc;
fc->mounted = 1; fc->mounted = 1;
fc->connected = 1; fc->connected = 1;
fc->count = 2; fc->count = 2;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment