diff options
author | Miklos Szeredi <miklos@szeredi.hu> | 2005-09-09 16:10:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 17:03:45 -0400 |
commit | e5e5558e923f35839108a12718494ecb73fb782f (patch) | |
tree | c410d6826e9df13f7ea9e382a26589b66ec0989c | |
parent | 334f485df85ac7736ebe14940bf0a059c5f26d7d (diff) |
[PATCH] FUSE - read-only operations
This patch adds the read-only filesystem operations of FUSE.
This contains the following files:
o dir.c
- directory, symlink and file-inode operations
The following operations are added:
o lookup
o getattr
o readlink
o follow_link
o directory open
o readdir
o directory release
o permission
o dentry revalidate
o statfs
Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/fuse/Makefile | 2 | ||||
-rw-r--r-- | fs/fuse/dev.c | 9 | ||||
-rw-r--r-- | fs/fuse/dir.c | 413 | ||||
-rw-r--r-- | fs/fuse/fuse_i.h | 51 | ||||
-rw-r--r-- | fs/fuse/inode.c | 81 | ||||
-rw-r--r-- | include/linux/fuse.h | 60 |
6 files changed, 615 insertions, 1 deletions
diff --git a/fs/fuse/Makefile b/fs/fuse/Makefile index 21021c356481..c34e268a0ed3 100644 --- a/fs/fuse/Makefile +++ b/fs/fuse/Makefile | |||
@@ -4,4 +4,4 @@ | |||
4 | 4 | ||
5 | obj-$(CONFIG_FUSE_FS) += fuse.o | 5 | obj-$(CONFIG_FUSE_FS) += fuse.o |
6 | 6 | ||
7 | fuse-objs := dev.o inode.o | 7 | fuse-objs := dev.o dir.o inode.o |
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 9aaf10a6588f..e8f3170946f1 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c | |||
@@ -691,6 +691,13 @@ static struct fuse_req *request_find(struct fuse_conn *fc, u64 unique) | |||
691 | return NULL; | 691 | return NULL; |
692 | } | 692 | } |
693 | 693 | ||
694 | /* fget() needs to be done in this context */ | ||
695 | static void process_getdir(struct fuse_req *req) | ||
696 | { | ||
697 | struct fuse_getdir_out_i *arg = req->out.args[0].value; | ||
698 | arg->file = fget(arg->fd); | ||
699 | } | ||
700 | |||
694 | static int copy_out_args(struct fuse_copy_state *cs, struct fuse_out *out, | 701 | static int copy_out_args(struct fuse_copy_state *cs, struct fuse_out *out, |
695 | unsigned nbytes) | 702 | unsigned nbytes) |
696 | { | 703 | { |
@@ -770,6 +777,8 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov, | |||
770 | if (!err) { | 777 | if (!err) { |
771 | if (req->interrupted) | 778 | if (req->interrupted) |
772 | err = -ENOENT; | 779 | err = -ENOENT; |
780 | else if (req->in.h.opcode == FUSE_GETDIR && !oh.error) | ||
781 | process_getdir(req); | ||
773 | } else if (!req->interrupted) | 782 | } else if (!req->interrupted) |
774 | req->out.h.error = -EIO; | 783 | req->out.h.error = -EIO; |
775 | request_end(fc, req); | 784 | request_end(fc, req); |
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c new file mode 100644 index 000000000000..a89730e70c58 --- /dev/null +++ b/fs/fuse/dir.c | |||
@@ -0,0 +1,413 @@ | |||
1 | /* | ||
2 | FUSE: Filesystem in Userspace | ||
3 | Copyright (C) 2001-2005 Miklos Szeredi <miklos@szeredi.hu> | ||
4 | |||
5 | This program can be distributed under the terms of the GNU GPL. | ||
6 | See the file COPYING. | ||
7 | */ | ||
8 | |||
9 | #include "fuse_i.h" | ||
10 | |||
11 | #include <linux/pagemap.h> | ||
12 | #include <linux/file.h> | ||
13 | #include <linux/gfp.h> | ||
14 | #include <linux/sched.h> | ||
15 | #include <linux/namei.h> | ||
16 | |||
17 | static inline unsigned long time_to_jiffies(unsigned long sec, | ||
18 | unsigned long nsec) | ||
19 | { | ||
20 | struct timespec ts = {sec, nsec}; | ||
21 | return jiffies + timespec_to_jiffies(&ts); | ||
22 | } | ||
23 | |||
24 | static void fuse_lookup_init(struct fuse_req *req, struct inode *dir, | ||
25 | struct dentry *entry, | ||
26 | struct fuse_entry_out *outarg) | ||
27 | { | ||
28 | req->in.h.opcode = FUSE_LOOKUP; | ||
29 | req->in.h.nodeid = get_node_id(dir); | ||
30 | req->inode = dir; | ||
31 | req->in.numargs = 1; | ||
32 | req->in.args[0].size = entry->d_name.len + 1; | ||
33 | req->in.args[0].value = entry->d_name.name; | ||
34 | req->out.numargs = 1; | ||
35 | req->out.args[0].size = sizeof(struct fuse_entry_out); | ||
36 | req->out.args[0].value = outarg; | ||
37 | } | ||
38 | |||
39 | static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd) | ||
40 | { | ||
41 | if (!entry->d_inode || is_bad_inode(entry->d_inode)) | ||
42 | return 0; | ||
43 | else if (time_after(jiffies, entry->d_time)) { | ||
44 | int err; | ||
45 | int version; | ||
46 | struct fuse_entry_out outarg; | ||
47 | struct inode *inode = entry->d_inode; | ||
48 | struct fuse_inode *fi = get_fuse_inode(inode); | ||
49 | struct fuse_conn *fc = get_fuse_conn(inode); | ||
50 | struct fuse_req *req = fuse_get_request_nonint(fc); | ||
51 | if (!req) | ||
52 | return 0; | ||
53 | |||
54 | fuse_lookup_init(req, entry->d_parent->d_inode, entry, &outarg); | ||
55 | request_send_nonint(fc, req); | ||
56 | version = req->out.h.unique; | ||
57 | err = req->out.h.error; | ||
58 | fuse_put_request(fc, req); | ||
59 | if (err || outarg.nodeid != get_node_id(inode) || | ||
60 | (outarg.attr.mode ^ inode->i_mode) & S_IFMT) | ||
61 | return 0; | ||
62 | |||
63 | fuse_change_attributes(inode, &outarg.attr); | ||
64 | inode->i_version = version; | ||
65 | entry->d_time = time_to_jiffies(outarg.entry_valid, | ||
66 | outarg.entry_valid_nsec); | ||
67 | fi->i_time = time_to_jiffies(outarg.attr_valid, | ||
68 | outarg.attr_valid_nsec); | ||
69 | } | ||
70 | return 1; | ||
71 | } | ||
72 | |||
73 | static struct dentry_operations fuse_dentry_operations = { | ||
74 | .d_revalidate = fuse_dentry_revalidate, | ||
75 | }; | ||
76 | |||
77 | static int fuse_lookup_iget(struct inode *dir, struct dentry *entry, | ||
78 | struct inode **inodep) | ||
79 | { | ||
80 | int err; | ||
81 | int version; | ||
82 | struct fuse_entry_out outarg; | ||
83 | struct inode *inode = NULL; | ||
84 | struct fuse_conn *fc = get_fuse_conn(dir); | ||
85 | struct fuse_req *req; | ||
86 | |||
87 | if (entry->d_name.len > FUSE_NAME_MAX) | ||
88 | return -ENAMETOOLONG; | ||
89 | |||
90 | req = fuse_get_request(fc); | ||
91 | if (!req) | ||
92 | return -ERESTARTNOINTR; | ||
93 | |||
94 | fuse_lookup_init(req, dir, entry, &outarg); | ||
95 | request_send(fc, req); | ||
96 | version = req->out.h.unique; | ||
97 | err = req->out.h.error; | ||
98 | if (!err) { | ||
99 | inode = fuse_iget(dir->i_sb, outarg.nodeid, outarg.generation, | ||
100 | &outarg.attr, version); | ||
101 | if (!inode) { | ||
102 | fuse_send_forget(fc, req, outarg.nodeid, version); | ||
103 | return -ENOMEM; | ||
104 | } | ||
105 | } | ||
106 | fuse_put_request(fc, req); | ||
107 | if (err && err != -ENOENT) | ||
108 | return err; | ||
109 | |||
110 | if (inode) { | ||
111 | struct fuse_inode *fi = get_fuse_inode(inode); | ||
112 | entry->d_time = time_to_jiffies(outarg.entry_valid, | ||
113 | outarg.entry_valid_nsec); | ||
114 | fi->i_time = time_to_jiffies(outarg.attr_valid, | ||
115 | outarg.attr_valid_nsec); | ||
116 | } | ||
117 | |||
118 | entry->d_op = &fuse_dentry_operations; | ||
119 | *inodep = inode; | ||
120 | return 0; | ||
121 | } | ||
122 | |||
123 | int fuse_do_getattr(struct inode *inode) | ||
124 | { | ||
125 | int err; | ||
126 | struct fuse_attr_out arg; | ||
127 | struct fuse_conn *fc = get_fuse_conn(inode); | ||
128 | struct fuse_req *req = fuse_get_request(fc); | ||
129 | if (!req) | ||
130 | return -ERESTARTNOINTR; | ||
131 | |||
132 | req->in.h.opcode = FUSE_GETATTR; | ||
133 | req->in.h.nodeid = get_node_id(inode); | ||
134 | req->inode = inode; | ||
135 | req->out.numargs = 1; | ||
136 | req->out.args[0].size = sizeof(arg); | ||
137 | req->out.args[0].value = &arg; | ||
138 | request_send(fc, req); | ||
139 | err = req->out.h.error; | ||
140 | fuse_put_request(fc, req); | ||
141 | if (!err) { | ||
142 | if ((inode->i_mode ^ arg.attr.mode) & S_IFMT) { | ||
143 | make_bad_inode(inode); | ||
144 | err = -EIO; | ||
145 | } else { | ||
146 | struct fuse_inode *fi = get_fuse_inode(inode); | ||
147 | fuse_change_attributes(inode, &arg.attr); | ||
148 | fi->i_time = time_to_jiffies(arg.attr_valid, | ||
149 | arg.attr_valid_nsec); | ||
150 | } | ||
151 | } | ||
152 | return err; | ||
153 | } | ||
154 | |||
155 | static int fuse_revalidate(struct dentry *entry) | ||
156 | { | ||
157 | struct inode *inode = entry->d_inode; | ||
158 | struct fuse_inode *fi = get_fuse_inode(inode); | ||
159 | struct fuse_conn *fc = get_fuse_conn(inode); | ||
160 | |||
161 | if (get_node_id(inode) == FUSE_ROOT_ID) { | ||
162 | if (current->fsuid != fc->user_id) | ||
163 | return -EACCES; | ||
164 | } else if (time_before_eq(jiffies, fi->i_time)) | ||
165 | return 0; | ||
166 | |||
167 | return fuse_do_getattr(inode); | ||
168 | } | ||
169 | |||
170 | static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd) | ||
171 | { | ||
172 | struct fuse_conn *fc = get_fuse_conn(inode); | ||
173 | |||
174 | if (current->fsuid != fc->user_id) | ||
175 | return -EACCES; | ||
176 | else { | ||
177 | int mode = inode->i_mode; | ||
178 | if ((mask & MAY_WRITE) && IS_RDONLY(inode) && | ||
179 | (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))) | ||
180 | return -EROFS; | ||
181 | if ((mask & MAY_EXEC) && !S_ISDIR(mode) && !(mode & S_IXUGO)) | ||
182 | return -EACCES; | ||
183 | return 0; | ||
184 | } | ||
185 | } | ||
186 | |||
187 | static int parse_dirfile(char *buf, size_t nbytes, struct file *file, | ||
188 | void *dstbuf, filldir_t filldir) | ||
189 | { | ||
190 | while (nbytes >= FUSE_NAME_OFFSET) { | ||
191 | struct fuse_dirent *dirent = (struct fuse_dirent *) buf; | ||
192 | size_t reclen = FUSE_DIRENT_SIZE(dirent); | ||
193 | int over; | ||
194 | if (!dirent->namelen || dirent->namelen > FUSE_NAME_MAX) | ||
195 | return -EIO; | ||
196 | if (reclen > nbytes) | ||
197 | break; | ||
198 | |||
199 | over = filldir(dstbuf, dirent->name, dirent->namelen, | ||
200 | file->f_pos, dirent->ino, dirent->type); | ||
201 | if (over) | ||
202 | break; | ||
203 | |||
204 | buf += reclen; | ||
205 | nbytes -= reclen; | ||
206 | file->f_pos = dirent->off; | ||
207 | } | ||
208 | |||
209 | return 0; | ||
210 | } | ||
211 | |||
212 | static int fuse_checkdir(struct file *cfile, struct file *file) | ||
213 | { | ||
214 | struct inode *inode; | ||
215 | if (!cfile) | ||
216 | return -EIO; | ||
217 | inode = cfile->f_dentry->d_inode; | ||
218 | if (!S_ISREG(inode->i_mode)) { | ||
219 | fput(cfile); | ||
220 | return -EIO; | ||
221 | } | ||
222 | |||
223 | file->private_data = cfile; | ||
224 | return 0; | ||
225 | } | ||
226 | |||
227 | static int fuse_getdir(struct file *file) | ||
228 | { | ||
229 | struct inode *inode = file->f_dentry->d_inode; | ||
230 | struct fuse_conn *fc = get_fuse_conn(inode); | ||
231 | struct fuse_req *req = fuse_get_request(fc); | ||
232 | struct fuse_getdir_out_i outarg; | ||
233 | int err; | ||
234 | |||
235 | if (!req) | ||
236 | return -ERESTARTNOINTR; | ||
237 | |||
238 | req->in.h.opcode = FUSE_GETDIR; | ||
239 | req->in.h.nodeid = get_node_id(inode); | ||
240 | req->inode = inode; | ||
241 | req->out.numargs = 1; | ||
242 | req->out.args[0].size = sizeof(struct fuse_getdir_out); | ||
243 | req->out.args[0].value = &outarg; | ||
244 | request_send(fc, req); | ||
245 | err = req->out.h.error; | ||
246 | fuse_put_request(fc, req); | ||
247 | if (!err) | ||
248 | err = fuse_checkdir(outarg.file, file); | ||
249 | return err; | ||
250 | } | ||
251 | |||
252 | static int fuse_readdir(struct file *file, void *dstbuf, filldir_t filldir) | ||
253 | { | ||
254 | struct file *cfile = file->private_data; | ||
255 | char *buf; | ||
256 | int ret; | ||
257 | |||
258 | if (!cfile) { | ||
259 | ret = fuse_getdir(file); | ||
260 | if (ret) | ||
261 | return ret; | ||
262 | |||
263 | cfile = file->private_data; | ||
264 | } | ||
265 | |||
266 | buf = (char *) __get_free_page(GFP_KERNEL); | ||
267 | if (!buf) | ||
268 | return -ENOMEM; | ||
269 | |||
270 | ret = kernel_read(cfile, file->f_pos, buf, PAGE_SIZE); | ||
271 | if (ret > 0) | ||
272 | ret = parse_dirfile(buf, ret, file, dstbuf, filldir); | ||
273 | |||
274 | free_page((unsigned long) buf); | ||
275 | return ret; | ||
276 | } | ||
277 | |||
278 | static char *read_link(struct dentry *dentry) | ||
279 | { | ||
280 | struct inode *inode = dentry->d_inode; | ||
281 | struct fuse_conn *fc = get_fuse_conn(inode); | ||
282 | struct fuse_req *req = fuse_get_request(fc); | ||
283 | char *link; | ||
284 | |||
285 | if (!req) | ||
286 | return ERR_PTR(-ERESTARTNOINTR); | ||
287 | |||
288 | link = (char *) __get_free_page(GFP_KERNEL); | ||
289 | if (!link) { | ||
290 | link = ERR_PTR(-ENOMEM); | ||
291 | goto out; | ||
292 | } | ||
293 | req->in.h.opcode = FUSE_READLINK; | ||
294 | req->in.h.nodeid = get_node_id(inode); | ||
295 | req->inode = inode; | ||
296 | req->out.argvar = 1; | ||
297 | req->out.numargs = 1; | ||
298 | req->out.args[0].size = PAGE_SIZE - 1; | ||
299 | req->out.args[0].value = link; | ||
300 | request_send(fc, req); | ||
301 | if (req->out.h.error) { | ||
302 | free_page((unsigned long) link); | ||
303 | link = ERR_PTR(req->out.h.error); | ||
304 | } else | ||
305 | link[req->out.args[0].size] = '\0'; | ||
306 | out: | ||
307 | fuse_put_request(fc, req); | ||
308 | return link; | ||
309 | } | ||
310 | |||
311 | static void free_link(char *link) | ||
312 | { | ||
313 | if (!IS_ERR(link)) | ||
314 | free_page((unsigned long) link); | ||
315 | } | ||
316 | |||
317 | static void *fuse_follow_link(struct dentry *dentry, struct nameidata *nd) | ||
318 | { | ||
319 | nd_set_link(nd, read_link(dentry)); | ||
320 | return NULL; | ||
321 | } | ||
322 | |||
323 | static void fuse_put_link(struct dentry *dentry, struct nameidata *nd, void *c) | ||
324 | { | ||
325 | free_link(nd_get_link(nd)); | ||
326 | } | ||
327 | |||
328 | static int fuse_dir_open(struct inode *inode, struct file *file) | ||
329 | { | ||
330 | file->private_data = NULL; | ||
331 | return 0; | ||
332 | } | ||
333 | |||
334 | static int fuse_dir_release(struct inode *inode, struct file *file) | ||
335 | { | ||
336 | struct file *cfile = file->private_data; | ||
337 | |||
338 | if (cfile) | ||
339 | fput(cfile); | ||
340 | |||
341 | return 0; | ||
342 | } | ||
343 | |||
344 | static int fuse_getattr(struct vfsmount *mnt, struct dentry *entry, | ||
345 | struct kstat *stat) | ||
346 | { | ||
347 | struct inode *inode = entry->d_inode; | ||
348 | int err = fuse_revalidate(entry); | ||
349 | if (!err) | ||
350 | generic_fillattr(inode, stat); | ||
351 | |||
352 | return err; | ||
353 | } | ||
354 | |||
355 | static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry, | ||
356 | struct nameidata *nd) | ||
357 | { | ||
358 | struct inode *inode; | ||
359 | int err = fuse_lookup_iget(dir, entry, &inode); | ||
360 | if (err) | ||
361 | return ERR_PTR(err); | ||
362 | if (inode && S_ISDIR(inode->i_mode)) { | ||
363 | /* Don't allow creating an alias to a directory */ | ||
364 | struct dentry *alias = d_find_alias(inode); | ||
365 | if (alias && !(alias->d_flags & DCACHE_DISCONNECTED)) { | ||
366 | dput(alias); | ||
367 | iput(inode); | ||
368 | return ERR_PTR(-EIO); | ||
369 | } | ||
370 | } | ||
371 | return d_splice_alias(inode, entry); | ||
372 | } | ||
373 | |||
374 | static struct inode_operations fuse_dir_inode_operations = { | ||
375 | .lookup = fuse_lookup, | ||
376 | .permission = fuse_permission, | ||
377 | .getattr = fuse_getattr, | ||
378 | }; | ||
379 | |||
380 | static struct file_operations fuse_dir_operations = { | ||
381 | .read = generic_read_dir, | ||
382 | .readdir = fuse_readdir, | ||
383 | .open = fuse_dir_open, | ||
384 | .release = fuse_dir_release, | ||
385 | }; | ||
386 | |||
387 | static struct inode_operations fuse_common_inode_operations = { | ||
388 | .permission = fuse_permission, | ||
389 | .getattr = fuse_getattr, | ||
390 | }; | ||
391 | |||
392 | static struct inode_operations fuse_symlink_inode_operations = { | ||
393 | .follow_link = fuse_follow_link, | ||
394 | .put_link = fuse_put_link, | ||
395 | .readlink = generic_readlink, | ||
396 | .getattr = fuse_getattr, | ||
397 | }; | ||
398 | |||
399 | void fuse_init_common(struct inode *inode) | ||
400 | { | ||
401 | inode->i_op = &fuse_common_inode_operations; | ||
402 | } | ||
403 | |||
404 | void fuse_init_dir(struct inode *inode) | ||
405 | { | ||
406 | inode->i_op = &fuse_dir_inode_operations; | ||
407 | inode->i_fop = &fuse_dir_operations; | ||
408 | } | ||
409 | |||
410 | void fuse_init_symlink(struct inode *inode) | ||
411 | { | ||
412 | inode->i_op = &fuse_symlink_inode_operations; | ||
413 | } | ||
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 50ad6a0c39bf..8d91e1492f96 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h | |||
@@ -30,6 +30,9 @@ struct fuse_inode { | |||
30 | * and kernel */ | 30 | * and kernel */ |
31 | u64 nodeid; | 31 | u64 nodeid; |
32 | 32 | ||
33 | /** The request used for sending the FORGET message */ | ||
34 | struct fuse_req *forget_req; | ||
35 | |||
33 | /** Time in jiffies until the file attributes are valid */ | 36 | /** Time in jiffies until the file attributes are valid */ |
34 | unsigned long i_time; | 37 | unsigned long i_time; |
35 | }; | 38 | }; |
@@ -129,6 +132,7 @@ struct fuse_req { | |||
129 | 132 | ||
130 | /** Data for asynchronous requests */ | 133 | /** Data for asynchronous requests */ |
131 | union { | 134 | union { |
135 | struct fuse_forget_in forget_in; | ||
132 | struct fuse_init_in_out init_in_out; | 136 | struct fuse_init_in_out init_in_out; |
133 | } misc; | 137 | } misc; |
134 | 138 | ||
@@ -197,6 +201,11 @@ struct fuse_conn { | |||
197 | struct backing_dev_info bdi; | 201 | struct backing_dev_info bdi; |
198 | }; | 202 | }; |
199 | 203 | ||
204 | struct fuse_getdir_out_i { | ||
205 | int fd; | ||
206 | void *file; /* Used by kernel only */ | ||
207 | }; | ||
208 | |||
200 | static inline struct fuse_conn **get_fuse_conn_super_p(struct super_block *sb) | 209 | static inline struct fuse_conn **get_fuse_conn_super_p(struct super_block *sb) |
201 | { | 210 | { |
202 | return (struct fuse_conn **) &sb->s_fs_info; | 211 | return (struct fuse_conn **) &sb->s_fs_info; |
@@ -240,6 +249,38 @@ extern struct file_operations fuse_dev_operations; | |||
240 | extern spinlock_t fuse_lock; | 249 | extern spinlock_t fuse_lock; |
241 | 250 | ||
242 | /** | 251 | /** |
252 | * Get a filled in inode | ||
253 | */ | ||
254 | struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid, | ||
255 | int generation, struct fuse_attr *attr, int version); | ||
256 | |||
257 | /** | ||
258 | * Send FORGET command | ||
259 | */ | ||
260 | void fuse_send_forget(struct fuse_conn *fc, struct fuse_req *req, | ||
261 | unsigned long nodeid, int version); | ||
262 | |||
263 | /** | ||
264 | * Initialise inode operations on regular files and special files | ||
265 | */ | ||
266 | void fuse_init_common(struct inode *inode); | ||
267 | |||
268 | /** | ||
269 | * Initialise inode and file operations on a directory | ||
270 | */ | ||
271 | void fuse_init_dir(struct inode *inode); | ||
272 | |||
273 | /** | ||
274 | * Initialise inode operations on a symlink | ||
275 | */ | ||
276 | void fuse_init_symlink(struct inode *inode); | ||
277 | |||
278 | /** | ||
279 | * Change attributes of an inode | ||
280 | */ | ||
281 | void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr); | ||
282 | |||
283 | /** | ||
243 | * Check if the connection can be released, and if yes, then free the | 284 | * Check if the connection can be released, and if yes, then free the |
244 | * connection structure | 285 | * connection structure |
245 | */ | 286 | */ |
@@ -307,6 +348,16 @@ void request_send_noreply(struct fuse_conn *fc, struct fuse_req *req); | |||
307 | void request_send_background(struct fuse_conn *fc, struct fuse_req *req); | 348 | void request_send_background(struct fuse_conn *fc, struct fuse_req *req); |
308 | 349 | ||
309 | /** | 350 | /** |
351 | * Get the attributes of a file | ||
352 | */ | ||
353 | int fuse_do_getattr(struct inode *inode); | ||
354 | |||
355 | /** | ||
356 | * Invalidate inode attributes | ||
357 | */ | ||
358 | void fuse_invalidate_attr(struct inode *inode); | ||
359 | |||
360 | /** | ||
310 | * Send the INIT message | 361 | * Send the INIT message |
311 | */ | 362 | */ |
312 | void fuse_send_init(struct fuse_conn *fc); | 363 | void fuse_send_init(struct fuse_conn *fc); |
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 33fad334ba70..41498a1952a0 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
@@ -51,12 +51,20 @@ static struct inode *fuse_alloc_inode(struct super_block *sb) | |||
51 | fi = get_fuse_inode(inode); | 51 | fi = get_fuse_inode(inode); |
52 | fi->i_time = jiffies - 1; | 52 | fi->i_time = jiffies - 1; |
53 | fi->nodeid = 0; | 53 | fi->nodeid = 0; |
54 | fi->forget_req = fuse_request_alloc(); | ||
55 | if (!fi->forget_req) { | ||
56 | kmem_cache_free(fuse_inode_cachep, inode); | ||
57 | return NULL; | ||
58 | } | ||
54 | 59 | ||
55 | return inode; | 60 | return inode; |
56 | } | 61 | } |
57 | 62 | ||
58 | static void fuse_destroy_inode(struct inode *inode) | 63 | static void fuse_destroy_inode(struct inode *inode) |
59 | { | 64 | { |
65 | struct fuse_inode *fi = get_fuse_inode(inode); | ||
66 | if (fi->forget_req) | ||
67 | fuse_request_free(fi->forget_req); | ||
60 | kmem_cache_free(fuse_inode_cachep, inode); | 68 | kmem_cache_free(fuse_inode_cachep, inode); |
61 | } | 69 | } |
62 | 70 | ||
@@ -65,8 +73,27 @@ static void fuse_read_inode(struct inode *inode) | |||
65 | /* No op */ | 73 | /* No op */ |
66 | } | 74 | } |
67 | 75 | ||
76 | void fuse_send_forget(struct fuse_conn *fc, struct fuse_req *req, | ||
77 | unsigned long nodeid, int version) | ||
78 | { | ||
79 | struct fuse_forget_in *inarg = &req->misc.forget_in; | ||
80 | inarg->version = version; | ||
81 | req->in.h.opcode = FUSE_FORGET; | ||
82 | req->in.h.nodeid = nodeid; | ||
83 | req->in.numargs = 1; | ||
84 | req->in.args[0].size = sizeof(struct fuse_forget_in); | ||
85 | req->in.args[0].value = inarg; | ||
86 | request_send_noreply(fc, req); | ||
87 | } | ||
88 | |||
68 | static void fuse_clear_inode(struct inode *inode) | 89 | static void fuse_clear_inode(struct inode *inode) |
69 | { | 90 | { |
91 | struct fuse_conn *fc = get_fuse_conn(inode); | ||
92 | if (fc) { | ||
93 | struct fuse_inode *fi = get_fuse_inode(inode); | ||
94 | fuse_send_forget(fc, fi->forget_req, fi->nodeid, inode->i_version); | ||
95 | fi->forget_req = NULL; | ||
96 | } | ||
70 | } | 97 | } |
71 | 98 | ||
72 | void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr) | 99 | void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr) |
@@ -94,6 +121,22 @@ static void fuse_init_inode(struct inode *inode, struct fuse_attr *attr) | |||
94 | { | 121 | { |
95 | inode->i_mode = attr->mode & S_IFMT; | 122 | inode->i_mode = attr->mode & S_IFMT; |
96 | i_size_write(inode, attr->size); | 123 | i_size_write(inode, attr->size); |
124 | if (S_ISREG(inode->i_mode)) { | ||
125 | fuse_init_common(inode); | ||
126 | } else if (S_ISDIR(inode->i_mode)) | ||
127 | fuse_init_dir(inode); | ||
128 | else if (S_ISLNK(inode->i_mode)) | ||
129 | fuse_init_symlink(inode); | ||
130 | else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode) || | ||
131 | S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) { | ||
132 | fuse_init_common(inode); | ||
133 | init_special_inode(inode, inode->i_mode, | ||
134 | new_decode_dev(attr->rdev)); | ||
135 | } else { | ||
136 | /* Don't let user create weird files */ | ||
137 | inode->i_mode = S_IFREG; | ||
138 | fuse_init_common(inode); | ||
139 | } | ||
97 | } | 140 | } |
98 | 141 | ||
99 | static int fuse_inode_eq(struct inode *inode, void *_nodeidp) | 142 | static int fuse_inode_eq(struct inode *inode, void *_nodeidp) |
@@ -158,6 +201,43 @@ static void fuse_put_super(struct super_block *sb) | |||
158 | spin_unlock(&fuse_lock); | 201 | spin_unlock(&fuse_lock); |
159 | } | 202 | } |
160 | 203 | ||
204 | static void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_kstatfs *attr) | ||
205 | { | ||
206 | stbuf->f_type = FUSE_SUPER_MAGIC; | ||
207 | stbuf->f_bsize = attr->bsize; | ||
208 | stbuf->f_blocks = attr->blocks; | ||
209 | stbuf->f_bfree = attr->bfree; | ||
210 | stbuf->f_bavail = attr->bavail; | ||
211 | stbuf->f_files = attr->files; | ||
212 | stbuf->f_ffree = attr->ffree; | ||
213 | stbuf->f_namelen = attr->namelen; | ||
214 | /* fsid is left zero */ | ||
215 | } | ||
216 | |||
217 | static int fuse_statfs(struct super_block *sb, struct kstatfs *buf) | ||
218 | { | ||
219 | struct fuse_conn *fc = get_fuse_conn_super(sb); | ||
220 | struct fuse_req *req; | ||
221 | struct fuse_statfs_out outarg; | ||
222 | int err; | ||
223 | |||
224 | req = fuse_get_request(fc); | ||
225 | if (!req) | ||
226 | return -ERESTARTSYS; | ||
227 | |||
228 | req->in.numargs = 0; | ||
229 | req->in.h.opcode = FUSE_STATFS; | ||
230 | req->out.numargs = 1; | ||
231 | req->out.args[0].size = sizeof(outarg); | ||
232 | req->out.args[0].value = &outarg; | ||
233 | request_send(fc, req); | ||
234 | err = req->out.h.error; | ||
235 | if (!err) | ||
236 | convert_fuse_statfs(buf, &outarg.st); | ||
237 | fuse_put_request(fc, req); | ||
238 | return err; | ||
239 | } | ||
240 | |||
161 | enum { | 241 | enum { |
162 | OPT_FD, | 242 | OPT_FD, |
163 | OPT_ROOTMODE, | 243 | OPT_ROOTMODE, |
@@ -318,6 +398,7 @@ static struct super_operations fuse_super_operations = { | |||
318 | .read_inode = fuse_read_inode, | 398 | .read_inode = fuse_read_inode, |
319 | .clear_inode = fuse_clear_inode, | 399 | .clear_inode = fuse_clear_inode, |
320 | .put_super = fuse_put_super, | 400 | .put_super = fuse_put_super, |
401 | .statfs = fuse_statfs, | ||
321 | .show_options = fuse_show_options, | 402 | .show_options = fuse_show_options, |
322 | }; | 403 | }; |
323 | 404 | ||
diff --git a/include/linux/fuse.h b/include/linux/fuse.h index a1aebd7104c4..21b9ba16f8d5 100644 --- a/include/linux/fuse.h +++ b/include/linux/fuse.h | |||
@@ -42,13 +42,61 @@ struct fuse_attr { | |||
42 | __u32 rdev; | 42 | __u32 rdev; |
43 | }; | 43 | }; |
44 | 44 | ||
45 | struct fuse_kstatfs { | ||
46 | __u64 blocks; | ||
47 | __u64 bfree; | ||
48 | __u64 bavail; | ||
49 | __u64 files; | ||
50 | __u64 ffree; | ||
51 | __u32 bsize; | ||
52 | __u32 namelen; | ||
53 | }; | ||
54 | |||
45 | enum fuse_opcode { | 55 | enum fuse_opcode { |
56 | FUSE_LOOKUP = 1, | ||
57 | FUSE_FORGET = 2, /* no reply */ | ||
58 | FUSE_GETATTR = 3, | ||
59 | FUSE_READLINK = 5, | ||
60 | FUSE_GETDIR = 7, | ||
61 | FUSE_STATFS = 17, | ||
46 | FUSE_INIT = 26 | 62 | FUSE_INIT = 26 |
47 | }; | 63 | }; |
48 | 64 | ||
49 | /* Conservative buffer size for the client */ | 65 | /* Conservative buffer size for the client */ |
50 | #define FUSE_MAX_IN 8192 | 66 | #define FUSE_MAX_IN 8192 |
51 | 67 | ||
68 | #define FUSE_NAME_MAX 1024 | ||
69 | |||
70 | struct fuse_entry_out { | ||
71 | __u64 nodeid; /* Inode ID */ | ||
72 | __u64 generation; /* Inode generation: nodeid:gen must | ||
73 | be unique for the fs's lifetime */ | ||
74 | __u64 entry_valid; /* Cache timeout for the name */ | ||
75 | __u64 attr_valid; /* Cache timeout for the attributes */ | ||
76 | __u32 entry_valid_nsec; | ||
77 | __u32 attr_valid_nsec; | ||
78 | struct fuse_attr attr; | ||
79 | }; | ||
80 | |||
81 | struct fuse_forget_in { | ||
82 | __u64 version; | ||
83 | }; | ||
84 | |||
85 | struct fuse_attr_out { | ||
86 | __u64 attr_valid; /* Cache timeout for the attributes */ | ||
87 | __u32 attr_valid_nsec; | ||
88 | __u32 dummy; | ||
89 | struct fuse_attr attr; | ||
90 | }; | ||
91 | |||
92 | struct fuse_getdir_out { | ||
93 | __u32 fd; | ||
94 | }; | ||
95 | |||
96 | struct fuse_statfs_out { | ||
97 | struct fuse_kstatfs st; | ||
98 | }; | ||
99 | |||
52 | struct fuse_init_in_out { | 100 | struct fuse_init_in_out { |
53 | __u32 major; | 101 | __u32 major; |
54 | __u32 minor; | 102 | __u32 minor; |
@@ -70,3 +118,15 @@ struct fuse_out_header { | |||
70 | __u64 unique; | 118 | __u64 unique; |
71 | }; | 119 | }; |
72 | 120 | ||
121 | struct fuse_dirent { | ||
122 | __u64 ino; | ||
123 | __u64 off; | ||
124 | __u32 namelen; | ||
125 | __u32 type; | ||
126 | char name[0]; | ||
127 | }; | ||
128 | |||
129 | #define FUSE_NAME_OFFSET ((unsigned) ((struct fuse_dirent *) 0)->name) | ||
130 | #define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1)) | ||
131 | #define FUSE_DIRENT_SIZE(d) \ | ||
132 | FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen) | ||