Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b25e82e5673c750116e8b01a4fc7d09be7809f8c
Commit:     b25e82e5673c750116e8b01a4fc7d09be7809f8c
Parent:     93a8c3cd9e9834dc5f5c373336f3a0065521152d
Author:     Miklos Szeredi <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 18 03:07:03 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Oct 18 14:37:31 2007 -0700

    fuse: add helper for asynchronous writes
    
    This patch adds a new helper function fuse_write_fill() which makes it
    possible to send WRITE requests asynchronously.
    
    A new flag for WRITE requests is also added which indicates that this a 
write
    from the page cache, and not a "normal" file write.
    
    This patch is in preparation for writable mmap support.
    
    Signed-off-by: Miklos Szeredi <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 fs/fuse/file.c       |   33 ++++++++++++++++++++-------------
 fs/fuse/fuse_i.h     |    4 ++++
 include/linux/fuse.h |    7 +++++++
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index c4c59c7..2b589de 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -443,30 +443,37 @@ out:
        return err;
 }
 
-static size_t fuse_send_write(struct fuse_req *req, struct file *file,
-                             struct inode *inode, loff_t pos, size_t count)
+static void fuse_write_fill(struct fuse_req *req, struct fuse_file *ff,
+                           struct inode *inode, loff_t pos, size_t count,
+                           int writepage)
 {
-       struct fuse_conn *fc = get_fuse_conn(inode);
-       struct fuse_file *ff = file->private_data;
-       struct fuse_write_in inarg;
-       struct fuse_write_out outarg;
+       struct fuse_write_in *inarg = &req->misc.write.in;
+       struct fuse_write_out *outarg = &req->misc.write.out;
 
-       memset(&inarg, 0, sizeof(struct fuse_write_in));
-       inarg.fh = ff->fh;
-       inarg.offset = pos;
-       inarg.size = count;
+       memset(inarg, 0, sizeof(struct fuse_write_in));
+       inarg->fh = ff->fh;
+       inarg->offset = pos;
+       inarg->size = count;
+       inarg->write_flags = writepage ? FUSE_WRITE_CACHE : 0;
        req->in.h.opcode = FUSE_WRITE;
        req->in.h.nodeid = get_node_id(inode);
        req->in.argpages = 1;
        req->in.numargs = 2;
        req->in.args[0].size = sizeof(struct fuse_write_in);
-       req->in.args[0].value = &inarg;
+       req->in.args[0].value = inarg;
        req->in.args[1].size = count;
        req->out.numargs = 1;
        req->out.args[0].size = sizeof(struct fuse_write_out);
-       req->out.args[0].value = &outarg;
+       req->out.args[0].value = outarg;
+}
+
+static size_t fuse_send_write(struct fuse_req *req, struct file *file,
+                             struct inode *inode, loff_t pos, size_t count)
+{
+       struct fuse_conn *fc = get_fuse_conn(inode);
+       fuse_write_fill(req, file->private_data, inode, pos, count, 0);
        request_send(fc, req);
-       return outarg.size;
+       return req->misc.write.out.size;
 }
 
 static int fuse_write_begin(struct file *file, struct address_space *mapping,
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index 5657cca..8b64a63 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -219,6 +219,10 @@ struct fuse_req {
                struct fuse_init_in init_in;
                struct fuse_init_out init_out;
                struct fuse_read_in read_in;
+               struct {
+                       struct fuse_write_in in;
+                       struct fuse_write_out out;
+               } write;
                struct fuse_lk_in lk_in;
        } misc;
 
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 015a8b1..6f4a312 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -119,6 +119,13 @@ struct fuse_file_lock {
  */
 #define FUSE_LK_FLOCK          (1 << 0)
 
+/**
+ * WRITE flags
+ *
+ * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed
+ */
+#define FUSE_WRITE_CACHE       (1 << 0)
+
 enum fuse_opcode {
        FUSE_LOOKUP        = 1,
        FUSE_FORGET        = 2,  /* no reply */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to