diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-09 14:19:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-09 14:19:06 -0500 |
| commit | 3af9cf11b6efb82aa7a1a24e2382b75d43631c4e (patch) | |
| tree | 506a491c1f46f20a07da2ff16603259427bec79d /fs/9p/v9fs_vfs.h | |
| parent | deb0c98c7f6035d47a247e548384517a955314a5 (diff) | |
| parent | 8781ff9495578dbb74065fae55305110d9f81cb9 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: fix p9_client_destroy unconditional calling v9fs_put_trans
9p: fix memory leak in v9fs_parse_options()
9p: Fix the kernel crash on a failed mount
9p: fix option parsing
9p: Include fsync support for 9p client
net/9p: fix statsize inside twstat
net/9p: fail when user specifies a transport which we can't find
net/9p: fix virtio transport to correctly update status on connect
Diffstat (limited to 'fs/9p/v9fs_vfs.h')
| -rw-r--r-- | fs/9p/v9fs_vfs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/9p/v9fs_vfs.h b/fs/9p/v9fs_vfs.h index 3a7560e3586..ed835836e0d 100644 --- a/fs/9p/v9fs_vfs.h +++ b/fs/9p/v9fs_vfs.h | |||
| @@ -60,3 +60,4 @@ void v9fs_dentry_release(struct dentry *); | |||
| 60 | int v9fs_uflags2omode(int uflags, int extended); | 60 | int v9fs_uflags2omode(int uflags, int extended); |
| 61 | 61 | ||
| 62 | ssize_t v9fs_file_readn(struct file *, char *, char __user *, u32, u64); | 62 | ssize_t v9fs_file_readn(struct file *, char *, char __user *, u32, u64); |
| 63 | void v9fs_blank_wstat(struct p9_wstat *wstat); | ||