diff options
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/namei.c b/fs/namei.c index 241cff423653..52703986323a 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
| @@ -106,7 +106,7 @@ | |||
| 106 | * any extra contention... | 106 | * any extra contention... |
| 107 | */ | 107 | */ |
| 108 | 108 | ||
| 109 | static int fastcall link_path_walk(const char *name, struct nameidata *nd); | 109 | static int link_path_walk(const char *name, struct nameidata *nd); |
| 110 | 110 | ||
| 111 | /* In order to reduce some races, while at the same time doing additional | 111 | /* In order to reduce some races, while at the same time doing additional |
| 112 | * checking and hopefully speeding things up, we copy filenames to the | 112 | * checking and hopefully speeding things up, we copy filenames to the |
| @@ -823,7 +823,7 @@ fail: | |||
| 823 | * Returns 0 and nd will have valid dentry and mnt on success. | 823 | * Returns 0 and nd will have valid dentry and mnt on success. |
| 824 | * Returns error and drops reference to input namei data on failure. | 824 | * Returns error and drops reference to input namei data on failure. |
| 825 | */ | 825 | */ |
| 826 | static fastcall int __link_path_walk(const char * name, struct nameidata *nd) | 826 | static int __link_path_walk(const char *name, struct nameidata *nd) |
| 827 | { | 827 | { |
| 828 | struct path next; | 828 | struct path next; |
| 829 | struct inode *inode; | 829 | struct inode *inode; |
| @@ -1015,7 +1015,7 @@ return_err: | |||
| 1015 | * Retry the whole path once, forcing real lookup requests | 1015 | * Retry the whole path once, forcing real lookup requests |
| 1016 | * instead of relying on the dcache. | 1016 | * instead of relying on the dcache. |
| 1017 | */ | 1017 | */ |
| 1018 | static int fastcall link_path_walk(const char *name, struct nameidata *nd) | 1018 | static int link_path_walk(const char *name, struct nameidata *nd) |
| 1019 | { | 1019 | { |
| 1020 | struct nameidata save = *nd; | 1020 | struct nameidata save = *nd; |
| 1021 | int result; | 1021 | int result; |
| @@ -1039,7 +1039,7 @@ static int fastcall link_path_walk(const char *name, struct nameidata *nd) | |||
| 1039 | return result; | 1039 | return result; |
| 1040 | } | 1040 | } |
| 1041 | 1041 | ||
| 1042 | static int fastcall path_walk(const char * name, struct nameidata *nd) | 1042 | static int path_walk(const char *name, struct nameidata *nd) |
| 1043 | { | 1043 | { |
| 1044 | current->total_link_count = 0; | 1044 | current->total_link_count = 0; |
| 1045 | return link_path_walk(name, nd); | 1045 | return link_path_walk(name, nd); |
| @@ -1116,7 +1116,7 @@ set_it: | |||
| 1116 | } | 1116 | } |
| 1117 | 1117 | ||
| 1118 | /* Returns 0 and nd will be valid on success; Retuns error, otherwise. */ | 1118 | /* Returns 0 and nd will be valid on success; Retuns error, otherwise. */ |
| 1119 | static int fastcall do_path_lookup(int dfd, const char *name, | 1119 | static int do_path_lookup(int dfd, const char *name, |
| 1120 | unsigned int flags, struct nameidata *nd) | 1120 | unsigned int flags, struct nameidata *nd) |
| 1121 | { | 1121 | { |
| 1122 | int retval = 0; | 1122 | int retval = 0; |
| @@ -1183,7 +1183,7 @@ fput_fail: | |||
| 1183 | goto out_fail; | 1183 | goto out_fail; |
| 1184 | } | 1184 | } |
| 1185 | 1185 | ||
| 1186 | int fastcall path_lookup(const char *name, unsigned int flags, | 1186 | int path_lookup(const char *name, unsigned int flags, |
| 1187 | struct nameidata *nd) | 1187 | struct nameidata *nd) |
| 1188 | { | 1188 | { |
| 1189 | return do_path_lookup(AT_FDCWD, name, flags, nd); | 1189 | return do_path_lookup(AT_FDCWD, name, flags, nd); |
| @@ -1409,7 +1409,7 @@ struct dentry *lookup_one_noperm(const char *name, struct dentry *base) | |||
| 1409 | return __lookup_hash(&this, base, NULL); | 1409 | return __lookup_hash(&this, base, NULL); |
| 1410 | } | 1410 | } |
| 1411 | 1411 | ||
| 1412 | int fastcall __user_walk_fd(int dfd, const char __user *name, unsigned flags, | 1412 | int __user_walk_fd(int dfd, const char __user *name, unsigned flags, |
| 1413 | struct nameidata *nd) | 1413 | struct nameidata *nd) |
| 1414 | { | 1414 | { |
| 1415 | char *tmp = getname(name); | 1415 | char *tmp = getname(name); |
| @@ -1422,7 +1422,7 @@ int fastcall __user_walk_fd(int dfd, const char __user *name, unsigned flags, | |||
| 1422 | return err; | 1422 | return err; |
| 1423 | } | 1423 | } |
| 1424 | 1424 | ||
| 1425 | int fastcall __user_walk(const char __user *name, unsigned flags, struct nameidata *nd) | 1425 | int __user_walk(const char __user *name, unsigned flags, struct nameidata *nd) |
| 1426 | { | 1426 | { |
| 1427 | return __user_walk_fd(AT_FDCWD, name, flags, nd); | 1427 | return __user_walk_fd(AT_FDCWD, name, flags, nd); |
| 1428 | } | 1428 | } |
