diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /fs/ufs/acl.c | |
parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'fs/ufs/acl.c')
-rw-r--r-- | fs/ufs/acl.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/ufs/acl.c b/fs/ufs/acl.c index 934e474a1..2b6768352 100644 --- a/fs/ufs/acl.c +++ b/fs/ufs/acl.c @@ -3,7 +3,7 @@ * * Copyright (C) 1998 * Daniel Pirkl <daniel.pirkl@email.cz> - * Charles Uiversity, Faculty of Mathematics and Physics + * Charles University, Faculty of Mathematics and Physics * * from * @@ -16,8 +16,7 @@ */ /* - * This file will contain the Access Control Lists management for the - * second extended file system. + * This file will contain the Access Control Lists management for UFS */ #include <linux/errno.h> @@ -39,8 +38,8 @@ int ufs_permission (struct inode * inode, int mask) * Nobody gets write access to a file on a readonly-fs */ if ((mask & S_IWOTH) && - (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)) && - IS_RDONLY(inode)) + (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)) && + IS_RDONLY(inode)) return -EROFS; /* * Nobody gets write access to an immutable file @@ -57,7 +56,7 @@ int ufs_permission (struct inode * inode, int mask) mode >>= 3; /* * Access is always granted for root. We now check last, - * though, for BSD process accounting correctness + * though, for BSD process accounting correctness */ if (((mode & mask & S_IRWXO) == mask) || fsuser()) return 0; |