fs/9p: Add read write helper function

[deliverable/linux.git] / fs / 9p / vfs_file.c

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 240c306743961d000909254f6e1278fa542d3e1e..6e1e8f43edaceea3a7436b230c6307c90d7f16b1 100644 (file)
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -44,9 +44,6 @@
 #include "fid.h"
 #include "cache.h"
 
-static const struct file_operations v9fs_cached_file_operations;
-static const struct file_operations v9fs_cached_file_operations_dotl;
-
 /**
  * v9fs_file_open - open a file (or directory)
  * @inode: inode to be opened
@@ -89,19 +86,10 @@ int v9fs_file_open(struct inode *inode, struct file *file)
        }
 
        file->private_data = fid;
-       if ((fid->qid.version) && (v9ses->cache)) {
-               P9_DPRINTK(P9_DEBUG_VFS, "cached");
-               /* enable cached file options */
-               if(file->f_op == &v9fs_file_operations)
-                       file->f_op = &v9fs_cached_file_operations;
-               else if (file->f_op == &v9fs_file_operations_dotl)
-                       file->f_op = &v9fs_cached_file_operations_dotl;
-
 #ifdef CONFIG_9P_FSCACHE
+       if (v9ses->cache)
                v9fs_cache_inode_set_cookie(inode, file);
 #endif
-       }
-
        return 0;
 }
 
@@ -335,25 +323,22 @@ out_err:
 }
 
 /**
- * v9fs_file_readn - read from a file
- * @filp: file pointer to read
+ * v9fs_fid_readn - read from a fid
+ * @fid: fid to read
  * @data: data buffer to read data into
  * @udata: user data buffer to read data into
  * @count: size of buffer
  * @offset: offset at which to read data
  *
  */
-
 ssize_t
-v9fs_file_readn(struct file *filp, char *data, char __user *udata, u32 count,
+v9fs_fid_readn(struct p9_fid *fid, char *data, char __user *udata, u32 count,
               u64 offset)
 {
        int n, total, size;
-       struct p9_fid *fid = filp->private_data;
 
        P9_DPRINTK(P9_DEBUG_VFS, "fid %d offset %llu count %d\n", fid->fid,
-                                       (long long unsigned) offset, count);
-
+                  (long long unsigned) offset, count);
        n = 0;
        total = 0;
        size = fid->iounit ? fid->iounit : fid->clnt->msize - P9_IOHDRSZ;
@@ -378,6 +363,22 @@ v9fs_file_readn(struct file *filp, char *data, char __user *udata, u32 count,
        return total;
 }
 
+/**
+ * v9fs_file_readn - read from a file
+ * @filp: file pointer to read
+ * @data: data buffer to read data into
+ * @udata: user data buffer to read data into
+ * @count: size of buffer
+ * @offset: offset at which to read data
+ *
+ */
+ssize_t
+v9fs_file_readn(struct file *filp, char *data, char __user *udata, u32 count,
+              u64 offset)
+{
+       return v9fs_fid_readn(filp->private_data, data, udata, count, offset);
+}
+
 /**
  * v9fs_file_read - read from a file
  * @filp: file pointer to read
@@ -410,45 +411,21 @@ v9fs_file_read(struct file *filp, char __user *udata, size_t count,
        return ret;
 }
 
-/**
- * v9fs_file_write - write to a file
- * @filp: file pointer to write
- * @data: data buffer to write data from
- * @count: size of buffer
- * @offset: offset at which to write data
- *
- */
-
-static ssize_t
-v9fs_file_write(struct file *filp, const char __user * data,
-               size_t count, loff_t * offset)
+ssize_t
+v9fs_file_write_internal(struct inode *inode, struct p9_fid *fid,
+                        const char __user *data, size_t count,
+                        loff_t *offset, int invalidate)
 {
-       ssize_t retval;
-       size_t total = 0;
        int n;
-       struct p9_fid *fid;
+       size_t total = 0;
        struct p9_client *clnt;
-       struct inode *inode = filp->f_path.dentry->d_inode;
        loff_t origin = *offset;
        unsigned long pg_start, pg_end;
 
        P9_DPRINTK(P9_DEBUG_VFS, "data %p count %d offset %x\n", data,
                (int)count, (int)*offset);
 
-       fid = filp->private_data;
        clnt = fid->clnt;
-
-       retval = generic_write_checks(filp, &origin, &count, 0);
-       if (retval)
-               goto out;
-
-       retval = -EINVAL;
-       if ((ssize_t) count < 0)
-               goto out;
-       retval = 0;
-       if (!count)
-               goto out;
-
        do {
                n = p9_client_write(fid, NULL, data+total, origin+total, count);
                if (n <= 0)
@@ -457,7 +434,7 @@ v9fs_file_write(struct file *filp, const char __user * data,
                total += n;
        } while (count > 0);
 
-       if (total > 0) {
+       if (invalidate && (total > 0)) {
                pg_start = origin >> PAGE_CACHE_SHIFT;
                pg_end = (origin + total - 1) >> PAGE_CACHE_SHIFT;
                if (inode->i_mapping && inode->i_mapping->nrpages)
@@ -467,11 +444,42 @@ v9fs_file_write(struct file *filp, const char __user * data,
                i_size_write(inode, i_size_read(inode) + total);
                inode->i_blocks = (i_size_read(inode) + 512 - 1) >> 9;
        }
-
        if (n < 0)
-               retval = n;
-       else
-               retval = total;
+               return n;
+
+       return total;
+}
+
+/**
+ * v9fs_file_write - write to a file
+ * @filp: file pointer to write
+ * @data: data buffer to write data from
+ * @count: size of buffer
+ * @offset: offset at which to write data
+ *
+ */
+static ssize_t
+v9fs_file_write(struct file *filp, const char __user * data,
+               size_t count, loff_t *offset)
+{
+       ssize_t retval = 0;
+       loff_t origin = *offset;
+
+
+       retval = generic_write_checks(filp, &origin, &count, 0);
+       if (retval)
+               goto out;
+
+       retval = -EINVAL;
+       if ((ssize_t) count < 0)
+               goto out;
+       retval = 0;
+       if (!count)
+               goto out;
+
+       return v9fs_file_write_internal(filp->f_path.dentry->d_inode,
+                                       filp->private_data,
+                                       data, count, offset, 1);
 out:
        return retval;
 }
@@ -505,7 +513,7 @@ int v9fs_file_fsync_dotl(struct file *filp, int datasync)
        return retval;
 }
 
-static const struct file_operations v9fs_cached_file_operations = {
+const struct file_operations v9fs_cached_file_operations = {
        .llseek = generic_file_llseek,
        .read = do_sync_read,
        .aio_read = generic_file_aio_read,
@@ -517,7 +525,7 @@ static const struct file_operations v9fs_cached_file_operations = {
        .fsync = v9fs_file_fsync,
 };
 
-static const struct file_operations v9fs_cached_file_operations_dotl = {
+const struct file_operations v9fs_cached_file_operations_dotl = {
        .llseek = generic_file_llseek,
        .read = do_sync_read,
        .aio_read = generic_file_aio_read,