diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 07:48:15 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 07:48:15 -0500 |
| commit | 444dc48298c480e42e15a8fe676be737d8a6b2a1 (patch) | |
| tree | bc76c5afaa746c8c27d0457e2035fe38ee45fb6c /fsdev | |
| parent | 5b15f27516ce3249c80bd2e0458d8d61f20da415 (diff) | |
| parent | 5f524c1ebcc5e0dec0de8940d34f9adb3c7887a1 (diff) | |
Merge remote-tracking branch 'aneesh/for-upstream-2' into staging
Diffstat (limited to 'fsdev')
| -rw-r--r-- | fsdev/file-op-9p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h index af9daf797f..1eda342f69 100644 --- a/fsdev/file-op-9p.h +++ b/fsdev/file-op-9p.h @@ -78,7 +78,7 @@ typedef struct FileOperations int (*open2)(FsContext *, const char *, int, FsCred *); void (*rewinddir)(FsContext *, DIR *); off_t (*telldir)(FsContext *, DIR *); - struct dirent *(*readdir)(FsContext *, DIR *); + int (*readdir_r)(FsContext *, DIR *, struct dirent *, struct dirent **); void (*seekdir)(FsContext *, DIR *, off_t); ssize_t (*preadv)(FsContext *, int, const struct iovec *, int, off_t); ssize_t (*pwritev)(FsContext *, int, const struct iovec *, int, off_t); |