diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 12:30:07 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 12:30:07 +0000 |
| commit | 64d58d4c8cd6a89ee218301ec0dc0ebfec91a4db (patch) | |
| tree | 51364ce35732f21fe21381a98908b273a09864c5 /arch/mips | |
| parent | 2173d0488b48df93be0fc4e2fc78f5a1eb66eb1f (diff) | |
Adopt to vfs changes in 2.1.43.
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/sysirix.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c index 7917664fd..95a0dc1c6 100644 --- a/arch/mips/kernel/sysirix.c +++ b/arch/mips/kernel/sysirix.c @@ -664,7 +664,7 @@ asmlinkage int irix_statfs(const char *path, struct irix_statfs *buf, error = verify_area(VERIFY_WRITE, buf, sizeof(struct irix_statfs)); if (error) goto out; - error = namei(path,&inode); + error = namei(NAM_FOLLOW_LINK, path, &inode); if (error) goto out; if (!inode->i_sb->s_op->statfs) { @@ -1390,7 +1390,7 @@ asmlinkage int irix_statvfs(char *fname, struct irix_statvfs *buf) error = verify_area(VERIFY_WRITE, buf, sizeof(struct irix_statvfs)); if(error) goto out; - error = namei(fname, &inode); + error = namei(NAM_FOLLOW_LINK, fname, &inode); if(error) goto out; if(!inode->i_sb->s_op->statfs) { @@ -1489,8 +1489,8 @@ out: return error; } -#define NOFOLLOW_LINKS 0 -#define FOLLOW_LINKS 1 +#define NOFOLLOW_LINKS NAM_FOLLOW_TRAILSLASH +#define FOLLOW_LINKS NAM_FOLLOW_LINK static inline int chown_common(char *filename, uid_t user, gid_t group, int follow) { @@ -1498,10 +1498,7 @@ static inline int chown_common(char *filename, uid_t user, gid_t group, int foll int error; struct iattr newattrs; - if(follow == NOFOLLOW_LINKS) - error = lnamei(filename,&inode); - else - error = namei(filename,&inode); + error = namei(follow, filename,&inode); if (error) return error; if (IS_RDONLY(inode)) { @@ -1734,7 +1731,7 @@ asmlinkage int irix_statvfs64(char *fname, struct irix_statvfs64 *buf) error = verify_area(VERIFY_WRITE, buf, sizeof(struct irix_statvfs)); if(error) goto out; - error = namei(fname, &inode); + error = namei(NAM_FOLLOW_LINK, fname, &inode); if(error) goto out; if(!inode->i_sb->s_op->statfs) { |