diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-05 09:37:49 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-05 09:37:49 -0600 |
| commit | f6480ca3f3423be5bee8b673ee6f5cc387659def (patch) | |
| tree | 35941ed726db5c27941dbc22d4c5a1ef6b166d09 /fsdev | |
| parent | cac1e30af72c4cf289750193426ebd5d2b6bd1d5 (diff) | |
| parent | 8b8882722210334f19b41950c82c529e33f97b00 (diff) | |
Merge remote-tracking branch 'aneesh/1.0-fixes' into staging
Diffstat (limited to 'fsdev')
| -rw-r--r-- | fsdev/file-op-9p.h | 4 | ||||
| -rw-r--r-- | fsdev/qemu-fsdev.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h index 1928da2525..a85ecd30b0 100644 --- a/fsdev/file-op-9p.h +++ b/fsdev/file-op-9p.h @@ -112,10 +112,10 @@ typedef struct FileOperations ssize_t (*pwritev)(FsContext *, V9fsFidOpenState *, const struct iovec *, int, off_t); int (*mkdir)(FsContext *, V9fsPath *, const char *, FsCred *); - int (*fstat)(FsContext *, V9fsFidOpenState *, struct stat *); + int (*fstat)(FsContext *, int, V9fsFidOpenState *, struct stat *); int (*rename)(FsContext *, const char *, const char *); int (*truncate)(FsContext *, V9fsPath *, off_t); - int (*fsync)(FsContext *, V9fsFidOpenState *, int); + int (*fsync)(FsContext *, int, V9fsFidOpenState *, int); int (*statfs)(FsContext *s, V9fsPath *path, struct statfs *stbuf); ssize_t (*lgetxattr)(FsContext *, V9fsPath *, const char *, void *, size_t); diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c index 7fd2aa7793..6684f7ea90 100644 --- a/fsdev/qemu-fsdev.c +++ b/fsdev/qemu-fsdev.c @@ -23,7 +23,9 @@ static QTAILQ_HEAD(FsDriverEntry_head, FsDriverListEntry) fsdriver_entries = static FsDriverTable FsDrivers[] = { { .name = "local", .ops = &local_ops}, +#ifdef CONFIG_OPEN_BY_HANDLE { .name = "handle", .ops = &handle_ops}, +#endif { .name = "synth", .ops = &synth_ops}, }; |