diff options
| -rw-r--r-- | fs/hostfs/hostfs.h | 2 | ||||
| -rw-r--r-- | fs/hostfs/hostfs_kern.c | 4 | ||||
| -rw-r--r-- | fs/hostfs/hostfs_user.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h index 6ae9011b95e..2f34f8f2134 100644 --- a/fs/hostfs/hostfs.h +++ b/fs/hostfs/hostfs.h | |||
| @@ -81,7 +81,7 @@ extern int do_rmdir(const char *file); | |||
| 81 | extern int do_mknod(const char *file, int mode, unsigned int major, | 81 | extern int do_mknod(const char *file, int mode, unsigned int major, |
| 82 | unsigned int minor); | 82 | unsigned int minor); |
| 83 | extern int link_file(const char *from, const char *to); | 83 | extern int link_file(const char *from, const char *to); |
| 84 | extern int do_readlink(char *file, char *buf, int size); | 84 | extern int hostfs_do_readlink(char *file, char *buf, int size); |
| 85 | extern int rename_file(char *from, char *to); | 85 | extern int rename_file(char *from, char *to); |
| 86 | extern int do_statfs(char *root, long *bsize_out, long long *blocks_out, | 86 | extern int do_statfs(char *root, long *bsize_out, long long *blocks_out, |
| 87 | long long *bfree_out, long long *bavail_out, | 87 | long long *bfree_out, long long *bavail_out, |
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 7f34f4385de..3a31451ac17 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c | |||
| @@ -168,7 +168,7 @@ static char *follow_link(char *link) | |||
| 168 | if (name == NULL) | 168 | if (name == NULL) |
| 169 | goto out; | 169 | goto out; |
| 170 | 170 | ||
| 171 | n = do_readlink(link, name, len); | 171 | n = hostfs_do_readlink(link, name, len); |
| 172 | if (n < len) | 172 | if (n < len) |
| 173 | break; | 173 | break; |
| 174 | len *= 2; | 174 | len *= 2; |
| @@ -943,7 +943,7 @@ int hostfs_link_readpage(struct file *file, struct page *page) | |||
| 943 | name = inode_name(page->mapping->host, 0); | 943 | name = inode_name(page->mapping->host, 0); |
| 944 | if (name == NULL) | 944 | if (name == NULL) |
| 945 | return -ENOMEM; | 945 | return -ENOMEM; |
| 946 | err = do_readlink(name, buffer, PAGE_CACHE_SIZE); | 946 | err = hostfs_do_readlink(name, buffer, PAGE_CACHE_SIZE); |
| 947 | kfree(name); | 947 | kfree(name); |
| 948 | if (err == PAGE_CACHE_SIZE) | 948 | if (err == PAGE_CACHE_SIZE) |
| 949 | err = -E2BIG; | 949 | err = -E2BIG; |
diff --git a/fs/hostfs/hostfs_user.c b/fs/hostfs/hostfs_user.c index 53fd0a67c11..b79424f9328 100644 --- a/fs/hostfs/hostfs_user.c +++ b/fs/hostfs/hostfs_user.c | |||
| @@ -377,7 +377,7 @@ int link_file(const char *to, const char *from) | |||
| 377 | return 0; | 377 | return 0; |
| 378 | } | 378 | } |
| 379 | 379 | ||
| 380 | int do_readlink(char *file, char *buf, int size) | 380 | int hostfs_do_readlink(char *file, char *buf, int size) |
| 381 | { | 381 | { |
| 382 | int n; | 382 | int n; |
| 383 | 383 | ||
