diff options
author | Fabian Frederick <fabf@skynet.be> | 2017-02-27 17:27:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-27 21:43:45 -0500 |
commit | 1bafd6f164d9ec9bf2fa9829051fbeb36342be0b (patch) | |
tree | a3900f7391aaf52b9d71ab64cad13b955356ec05 /fs/affs | |
parent | ed4433d72394131244276d6e7590a7b24a2c9f64 (diff) |
fs/affs: use octal for permissions
According to commit f90774e1fd27 ("checkpatch: look for symbolic
permissions and suggest octal instead")
Link: http://lkml.kernel.org/r/20170109191208.6085-5-fabf@skynet.be
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/affs')
-rw-r--r-- | fs/affs/amigaffs.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c index 0ec65c133b93..fd7a7542956d 100644 --- a/fs/affs/amigaffs.c +++ b/fs/affs/amigaffs.c | |||
@@ -391,23 +391,23 @@ prot_to_mode(u32 prot) | |||
391 | umode_t mode = 0; | 391 | umode_t mode = 0; |
392 | 392 | ||
393 | if (!(prot & FIBF_NOWRITE)) | 393 | if (!(prot & FIBF_NOWRITE)) |
394 | mode |= S_IWUSR; | 394 | mode |= 0200; |
395 | if (!(prot & FIBF_NOREAD)) | 395 | if (!(prot & FIBF_NOREAD)) |
396 | mode |= S_IRUSR; | 396 | mode |= 0400; |
397 | if (!(prot & FIBF_NOEXECUTE)) | 397 | if (!(prot & FIBF_NOEXECUTE)) |
398 | mode |= S_IXUSR; | 398 | mode |= 0100; |
399 | if (prot & FIBF_GRP_WRITE) | 399 | if (prot & FIBF_GRP_WRITE) |
400 | mode |= S_IWGRP; | 400 | mode |= 0020; |
401 | if (prot & FIBF_GRP_READ) | 401 | if (prot & FIBF_GRP_READ) |
402 | mode |= S_IRGRP; | 402 | mode |= 0040; |
403 | if (prot & FIBF_GRP_EXECUTE) | 403 | if (prot & FIBF_GRP_EXECUTE) |
404 | mode |= S_IXGRP; | 404 | mode |= 0010; |
405 | if (prot & FIBF_OTR_WRITE) | 405 | if (prot & FIBF_OTR_WRITE) |
406 | mode |= S_IWOTH; | 406 | mode |= 0002; |
407 | if (prot & FIBF_OTR_READ) | 407 | if (prot & FIBF_OTR_READ) |
408 | mode |= S_IROTH; | 408 | mode |= 0004; |
409 | if (prot & FIBF_OTR_EXECUTE) | 409 | if (prot & FIBF_OTR_EXECUTE) |
410 | mode |= S_IXOTH; | 410 | mode |= 0001; |
411 | 411 | ||
412 | return mode; | 412 | return mode; |
413 | } | 413 | } |
@@ -418,23 +418,23 @@ mode_to_prot(struct inode *inode) | |||
418 | u32 prot = AFFS_I(inode)->i_protect; | 418 | u32 prot = AFFS_I(inode)->i_protect; |
419 | umode_t mode = inode->i_mode; | 419 | umode_t mode = inode->i_mode; |
420 | 420 | ||
421 | if (!(mode & S_IXUSR)) | 421 | if (!(mode & 0100)) |
422 | prot |= FIBF_NOEXECUTE; | 422 | prot |= FIBF_NOEXECUTE; |
423 | if (!(mode & S_IRUSR)) | 423 | if (!(mode & 0400)) |
424 | prot |= FIBF_NOREAD; | 424 | prot |= FIBF_NOREAD; |
425 | if (!(mode & S_IWUSR)) | 425 | if (!(mode & 0200)) |
426 | prot |= FIBF_NOWRITE; | 426 | prot |= FIBF_NOWRITE; |
427 | if (mode & S_IXGRP) | 427 | if (mode & 0010) |
428 | prot |= FIBF_GRP_EXECUTE; | 428 | prot |= FIBF_GRP_EXECUTE; |
429 | if (mode & S_IRGRP) | 429 | if (mode & 0040) |
430 | prot |= FIBF_GRP_READ; | 430 | prot |= FIBF_GRP_READ; |
431 | if (mode & S_IWGRP) | 431 | if (mode & 0020) |
432 | prot |= FIBF_GRP_WRITE; | 432 | prot |= FIBF_GRP_WRITE; |
433 | if (mode & S_IXOTH) | 433 | if (mode & 0001) |
434 | prot |= FIBF_OTR_EXECUTE; | 434 | prot |= FIBF_OTR_EXECUTE; |
435 | if (mode & S_IROTH) | 435 | if (mode & 0004) |
436 | prot |= FIBF_OTR_READ; | 436 | prot |= FIBF_OTR_READ; |
437 | if (mode & S_IWOTH) | 437 | if (mode & 0002) |
438 | prot |= FIBF_OTR_WRITE; | 438 | prot |= FIBF_OTR_WRITE; |
439 | 439 | ||
440 | AFFS_I(inode)->i_protect = prot; | 440 | AFFS_I(inode)->i_protect = prot; |