diff options
author | Paul Mackerras <paulus@samba.org> | 2008-12-03 20:11:06 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-12-03 20:11:06 +1100 |
commit | 527491885554002837b5742202adc0ab5f536e54 (patch) | |
tree | 6d9c44776e0b4368eccd414b92b957fac3c5a4c6 /fs/hostfs/hostfs_user.c | |
parent | cea555d384b85271035814c5adad23e6c7fc5d2a (diff) | |
parent | 2434bbb30e79468c49cff3cff6005236f55ed188 (diff) | |
download | kernel-crypto-527491885554002837b5742202adc0ab5f536e54.tar.gz kernel-crypto-527491885554002837b5742202adc0ab5f536e54.tar.xz kernel-crypto-527491885554002837b5742202adc0ab5f536e54.zip |
Merge branch 'merge'
Diffstat (limited to 'fs/hostfs/hostfs_user.c')
-rw-r--r-- | fs/hostfs/hostfs_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) return 0; } -int do_readlink(char *file, char *buf, int size) +int hostfs_do_readlink(char *file, char *buf, int size) { int n; |