diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 22:30:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 22:30:51 -0400 |
| commit | 8f40f672e6bb071812f61bfbd30efc3fc1263ad1 (patch) | |
| tree | 8dcdbbb7adc68647267794c4e3a4686afd94ad65 /fs/9p/vfs_dir.c | |
| parent | 8978a318837d7acefca82645017c0534aeba5a36 (diff) | |
| parent | 887b3ece65be7b643dfdae0d433c91a26a3f437d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: fix error path during early mount
9p: make cryptic unknown error from server less scary
9p: fix flags length in net
9p: Correct fidpool creation failure in p9_client_create
9p: use struct mutex instead of struct semaphore
9p: propagate parse_option changes to client and transports
fs/9p/v9fs.c (v9fs_parse_options): Handle kstrdup and match_strdup failure.
9p: Documentation updates
add match_strlcpy() us it to make v9fs make uname and remotename parsing more robust
Diffstat (limited to 'fs/9p/vfs_dir.c')
| -rw-r--r-- | fs/9p/vfs_dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c index 0924d4477da3..88e3787c6ea9 100644 --- a/fs/9p/vfs_dir.c +++ b/fs/9p/vfs_dir.c | |||
| @@ -60,7 +60,7 @@ static inline int dt_type(struct p9_stat *mistat) | |||
| 60 | 60 | ||
| 61 | /** | 61 | /** |
| 62 | * v9fs_dir_readdir - read a directory | 62 | * v9fs_dir_readdir - read a directory |
| 63 | * @filep: opened file structure | 63 | * @filp: opened file structure |
| 64 | * @dirent: directory structure ??? | 64 | * @dirent: directory structure ??? |
| 65 | * @filldir: function to populate directory structure ??? | 65 | * @filldir: function to populate directory structure ??? |
| 66 | * | 66 | * |