aboutsummaryrefslogtreecommitdiffstats
path: root/fs/9p/vfs_file.c
diff options
context:
space:
mode:
authorLatchesar Ionkov <lucho@ionkov.net>2007-07-10 18:57:28 -0400
committerEric Van Hensbergen <ericvh@ericvh-desktop.austin.ibm.com>2007-07-14 16:13:40 -0400
commitbd238fb431f31989898423c8b6496bc8c4204a86 (patch)
treef85a536383cbf360125ecb0592f6c515e0ecf0ff /fs/9p/vfs_file.c
parent8d9107e8c50e1c4ff43c91c8841805833f3ecfb9 (diff)
9p: Reorganization of 9p file system code
This patchset moves non-filesystem interfaces of v9fs from fs/9p to net/9p. It moves the transport, packet marshalling and connection layers to net/9p leaving only the VFS related files in fs/9p. This work is being done in preparation for in-kernel 9p servers as well as alternate 9p clients (other than VFS). Signed-off-by: Latchesar Ionkov <lucho@ionkov.net> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'fs/9p/vfs_file.c')
-rw-r--r--fs/9p/vfs_file.c160
1 files changed, 39 insertions, 121 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 6e7678e4852f..c1f7c027cfeb 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -34,10 +34,10 @@
34#include <linux/list.h> 34#include <linux/list.h>
35#include <asm/uaccess.h> 35#include <asm/uaccess.h>
36#include <linux/idr.h> 36#include <linux/idr.h>
37#include <net/9p/9p.h>
38#include <net/9p/client.h>
37 39
38#include "debug.h"
39#include "v9fs.h" 40#include "v9fs.h"
40#include "9p.h"
41#include "v9fs_vfs.h" 41#include "v9fs_vfs.h"
42#include "fid.h" 42#include "fid.h"
43 43
@@ -52,48 +52,36 @@ static const struct file_operations v9fs_cached_file_operations;
52 52
53int v9fs_file_open(struct inode *inode, struct file *file) 53int v9fs_file_open(struct inode *inode, struct file *file)
54{ 54{
55 struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode);
56 struct v9fs_fid *vfid;
57 struct v9fs_fcall *fcall = NULL;
58 int omode;
59 int err; 55 int err;
56 struct v9fs_session_info *v9ses;
57 struct p9_fid *fid;
58 int omode;
60 59
61 dprintk(DEBUG_VFS, "inode: %p file: %p \n", inode, file); 60 P9_DPRINTK(P9_DEBUG_VFS, "inode: %p file: %p \n", inode, file);
62 61 v9ses = v9fs_inode2v9ses(inode);
63 vfid = v9fs_fid_clone(file->f_path.dentry);
64 if (IS_ERR(vfid))
65 return PTR_ERR(vfid);
66
67 omode = v9fs_uflags2omode(file->f_flags); 62 omode = v9fs_uflags2omode(file->f_flags);
68 err = v9fs_t_open(v9ses, vfid->fid, omode, &fcall); 63 fid = file->private_data;
64 if (!fid) {
65 fid = v9fs_fid_clone(file->f_path.dentry);
66 if (IS_ERR(fid))
67 return PTR_ERR(fid);
68
69 err = p9_client_open(fid, omode);
69 if (err < 0) { 70 if (err < 0) {
70 PRINT_FCALL_ERROR("open failed", fcall); 71 p9_client_clunk(fid);
71 goto Clunk_Fid; 72 return err;
73 }
72 } 74 }
73 75
74 file->private_data = vfid; 76 file->private_data = fid;
75 vfid->fidopen = 1; 77 if ((fid->qid.version) && (v9ses->cache)) {
76 vfid->fidclunked = 0; 78 P9_DPRINTK(P9_DEBUG_VFS, "cached");
77 vfid->iounit = fcall->params.ropen.iounit;
78 vfid->rdir_pos = 0;
79 vfid->rdir_fcall = NULL;
80 vfid->filp = file;
81 kfree(fcall);
82
83 if((vfid->qid.version) && (v9ses->cache)) {
84 dprintk(DEBUG_VFS, "cached");
85 /* enable cached file options */ 79 /* enable cached file options */
86 if(file->f_op == &v9fs_file_operations) 80 if(file->f_op == &v9fs_file_operations)
87 file->f_op = &v9fs_cached_file_operations; 81 file->f_op = &v9fs_cached_file_operations;
88 } 82 }
89 83
90 return 0; 84 return 0;
91
92Clunk_Fid:
93 v9fs_fid_clunk(v9ses, vfid);
94 kfree(fcall);
95
96 return err;
97} 85}
98 86
99/** 87/**
@@ -110,7 +98,7 @@ static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl)
110 int res = 0; 98 int res = 0;
111 struct inode *inode = filp->f_path.dentry->d_inode; 99 struct inode *inode = filp->f_path.dentry->d_inode;
112 100
113 dprintk(DEBUG_VFS, "filp: %p lock: %p\n", filp, fl); 101 P9_DPRINTK(P9_DEBUG_VFS, "filp: %p lock: %p\n", filp, fl);
114 102
115 /* No mandatory locks */ 103 /* No mandatory locks */
116 if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) 104 if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
@@ -136,55 +124,16 @@ static ssize_t
136v9fs_file_read(struct file *filp, char __user * data, size_t count, 124v9fs_file_read(struct file *filp, char __user * data, size_t count,
137 loff_t * offset) 125 loff_t * offset)
138{ 126{
139 struct inode *inode = filp->f_path.dentry->d_inode; 127 int ret;
140 struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); 128 struct p9_fid *fid;
141 struct v9fs_fid *v9f = filp->private_data;
142 struct v9fs_fcall *fcall = NULL;
143 int fid = v9f->fid;
144 int rsize = 0;
145 int result = 0;
146 int total = 0;
147 int n;
148
149 dprintk(DEBUG_VFS, "\n");
150
151 rsize = v9ses->maxdata - V9FS_IOHDRSZ;
152 if (v9f->iounit != 0 && rsize > v9f->iounit)
153 rsize = v9f->iounit;
154
155 do {
156 if (count < rsize)
157 rsize = count;
158 129
159 result = v9fs_t_read(v9ses, fid, *offset, rsize, &fcall); 130 P9_DPRINTK(P9_DEBUG_VFS, "\n");
131 fid = filp->private_data;
132 ret = p9_client_uread(fid, data, *offset, count);
133 if (ret > 0)
134 *offset += ret;
160 135
161 if (result < 0) { 136 return ret;
162 printk(KERN_ERR "9P2000: v9fs_t_read returned %d\n",
163 result);
164
165 kfree(fcall);
166 return total;
167 } else
168 *offset += result;
169
170 n = copy_to_user(data, fcall->params.rread.data, result);
171 if (n) {
172 dprintk(DEBUG_ERROR, "Problem copying to user %d\n", n);
173 kfree(fcall);
174 return -EFAULT;
175 }
176
177 count -= result;
178 data += result;
179 total += result;
180
181 kfree(fcall);
182
183 if (result < rsize)
184 break;
185 } while (count);
186
187 return total;
188} 137}
189 138
190/** 139/**
@@ -200,50 +149,19 @@ static ssize_t
200v9fs_file_write(struct file *filp, const char __user * data, 149v9fs_file_write(struct file *filp, const char __user * data,
201 size_t count, loff_t * offset) 150 size_t count, loff_t * offset)
202{ 151{
203 struct inode *inode = filp->f_path.dentry->d_inode; 152 int ret;
204 struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); 153 struct p9_fid *fid;
205 struct v9fs_fid *v9fid = filp->private_data;
206 struct v9fs_fcall *fcall;
207 int fid = v9fid->fid;
208 int result = -EIO;
209 int rsize = 0;
210 int total = 0;
211
212 dprintk(DEBUG_VFS, "data %p count %d offset %x\n", data, (int)count,
213 (int)*offset);
214 rsize = v9ses->maxdata - V9FS_IOHDRSZ;
215 if (v9fid->iounit != 0 && rsize > v9fid->iounit)
216 rsize = v9fid->iounit;
217
218 do {
219 if (count < rsize)
220 rsize = count;
221 154
222 result = v9fs_t_write(v9ses, fid, *offset, rsize, data, &fcall); 155 P9_DPRINTK(P9_DEBUG_VFS, "data %p count %d offset %x\n", data,
223 if (result < 0) { 156 (int)count, (int)*offset);
224 PRINT_FCALL_ERROR("error while writing", fcall);
225 kfree(fcall);
226 return result;
227 } else
228 *offset += result;
229
230 kfree(fcall);
231 fcall = NULL;
232
233 if (result != rsize) {
234 eprintk(KERN_ERR,
235 "short write: v9fs_t_write returned %d\n",
236 result);
237 break;
238 }
239 157
240 count -= result; 158 fid = filp->private_data;
241 data += result; 159 ret = p9_client_uwrite(fid, data, *offset, count);
242 total += result; 160 if (ret > 0)
243 } while (count); 161 *offset += ret;
244 162
245 invalidate_inode_pages2(inode->i_mapping); 163 invalidate_inode_pages2(filp->f_path.dentry->d_inode->i_mapping);
246 return total; 164 return ret;
247} 165}
248 166
249static const struct file_operations v9fs_cached_file_operations = { 167static const struct file_operations v9fs_cached_file_operations = {