diff options
Diffstat (limited to 'fs/namei.c')
-rw-r--r-- | fs/namei.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c index 1e5746eb1380..7bde381fa490 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -113,7 +113,7 @@ | |||
113 | * POSIX.1 2.4: an empty pathname is invalid (ENOENT). | 113 | * POSIX.1 2.4: an empty pathname is invalid (ENOENT). |
114 | * PATH_MAX includes the nul terminator --RR. | 114 | * PATH_MAX includes the nul terminator --RR. |
115 | */ | 115 | */ |
116 | static inline int do_getname(const char __user *filename, char *page) | 116 | static int do_getname(const char __user *filename, char *page) |
117 | { | 117 | { |
118 | int retval; | 118 | int retval; |
119 | unsigned long len = PATH_MAX; | 119 | unsigned long len = PATH_MAX; |
@@ -396,7 +396,7 @@ static struct dentry * cached_lookup(struct dentry * parent, struct qstr * name, | |||
396 | * short-cut DAC fails, then call permission() to do more | 396 | * short-cut DAC fails, then call permission() to do more |
397 | * complete permission check. | 397 | * complete permission check. |
398 | */ | 398 | */ |
399 | static inline int exec_permission_lite(struct inode *inode, | 399 | static int exec_permission_lite(struct inode *inode, |
400 | struct nameidata *nd) | 400 | struct nameidata *nd) |
401 | { | 401 | { |
402 | umode_t mode = inode->i_mode; | 402 | umode_t mode = inode->i_mode; |
@@ -1294,7 +1294,7 @@ static inline int check_sticky(struct inode *dir, struct inode *inode) | |||
1294 | * 10. We don't allow removal of NFS sillyrenamed files; it's handled by | 1294 | * 10. We don't allow removal of NFS sillyrenamed files; it's handled by |
1295 | * nfs_async_unlink(). | 1295 | * nfs_async_unlink(). |
1296 | */ | 1296 | */ |
1297 | static inline int may_delete(struct inode *dir,struct dentry *victim,int isdir) | 1297 | static int may_delete(struct inode *dir,struct dentry *victim,int isdir) |
1298 | { | 1298 | { |
1299 | int error; | 1299 | int error; |
1300 | 1300 | ||
@@ -2315,7 +2315,7 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
2315 | return error; | 2315 | return error; |
2316 | } | 2316 | } |
2317 | 2317 | ||
2318 | static inline int do_rename(const char * oldname, const char * newname) | 2318 | static int do_rename(const char * oldname, const char * newname) |
2319 | { | 2319 | { |
2320 | int error = 0; | 2320 | int error = 0; |
2321 | struct dentry * old_dir, * new_dir; | 2321 | struct dentry * old_dir, * new_dir; |