diff options
| -rw-r--r-- | kernel/dev.c | 4 | ||||
| -rw-r--r-- | kernel/dir.c | 2 | ||||
| -rw-r--r-- | kernel/fuse_i.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kernel/dev.c b/kernel/dev.c index c2d45fc..f7ea7a2 100644 --- a/kernel/dev.c +++ b/kernel/dev.c @@ -274,7 +274,7 @@ static void queue_request(struct fuse_conn *fc, struct fuse_req *req) if (fc->reqctr == 0) fc->reqctr = 1; req->in.h.unique = fc->reqctr; - req->in.h.len = sizeof(struct fuse_in_header) + + req->in.h.len = sizeof(struct fuse_in_header) + len_args(req->in.numargs, (struct fuse_arg *) req->in.args); if (!req->preallocated) { /* decrease outstanding_sem, but without blocking... */ @@ -711,7 +711,7 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov, if (err) goto err_finish; err = -EINVAL; - if (!oh.unique || oh.error <= -1000 || oh.error > 0 || + if (!oh.unique || oh.error <= -1000 || oh.error > 0 || oh.len != nbytes) goto err_finish; diff --git a/kernel/dir.c b/kernel/dir.c index 6d968ed..41f824c 100644 --- a/kernel/dir.c +++ b/kernel/dir.c @@ -360,7 +360,7 @@ static int fuse_rename(struct inode *olddir, struct dentry *oldent, if (newent->d_inode) fuse_invalidate_entry(newent); } - + return err; } diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h index cda7e9b..d9a4125 100644 --- a/kernel/fuse_i.h +++ b/kernel/fuse_i.h @@ -199,7 +199,7 @@ struct fuse_req { /** Request is sent in the background */ unsigned background:1; - + /** Data is being copied to/from the request */ unsigned locked:1; @@ -236,7 +236,7 @@ struct fuse_req { /** Inode used in the request */ struct inode *inode; - + /** Second inode used in the request (or NULL) */ struct inode *inode2; |