udf: use octal for permissions

According to commit f90774e1fd27 ("checkpatch: look for symbolic
permissions and suggest octal instead")

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index a8d8f71ef8bdb577675284e9cb5f03d38f1d34f7..8715dcd115965a52e8dabd0432f29413e6be9ef0 100644 (file)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1535,7 +1535,7 @@ reread:
                inode->i_data.a_ops = &udf_symlink_aops;
                inode->i_op = &udf_symlink_inode_operations;
                inode_nohighmem(inode);
-               inode->i_mode = S_IFLNK | S_IRWXUGO;
+               inode->i_mode = S_IFLNK | 0777;
                break;
        case ICBTAG_FILE_TYPE_MAIN:
                udf_debug("METADATA FILE-----\n");
@@ -1591,9 +1591,9 @@ static umode_t udf_convert_permissions(struct fileEntry *fe)
        permissions = le32_to_cpu(fe->permissions);
        flags = le16_to_cpu(fe->icbTag.flags);
 
-       mode =  ((permissions) & S_IRWXO) |
-               ((permissions >> 2) & S_IRWXG) |
-               ((permissions >> 4) & S_IRWXU) |
+       mode =  ((permissions) & 0007) |
+               ((permissions >> 2) & 0070) |
+               ((permissions >> 4) & 0700) |
                ((flags & ICBTAG_FLAG_SETUID) ? S_ISUID : 0) |
                ((flags & ICBTAG_FLAG_SETGID) ? S_ISGID : 0) |
                ((flags & ICBTAG_FLAG_STICKY) ? S_ISVTX : 0);
@@ -1669,9 +1669,9 @@ static int udf_update_inode(struct inode *inode, int do_sync)
        else
                fe->gid = cpu_to_le32(i_gid_read(inode));
 
-       udfperms = ((inode->i_mode & S_IRWXO)) |
-                  ((inode->i_mode & S_IRWXG) << 2) |
-                  ((inode->i_mode & S_IRWXU) << 4);
+       udfperms = ((inode->i_mode & 0007)) |
+                  ((inode->i_mode & 0070) << 2) |
+                  ((inode->i_mode & 0700) << 4);
 
        udfperms |= (le32_to_cpu(fe->permissions) &
                    (FE_PERM_O_DELETE | FE_PERM_O_CHATTR |

diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index babf48d0e55330ec798460c2a7500878b90eeb06..385ee89d58242d9ffc920b9d2cb6db55999d073b 100644 (file)
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -906,7 +906,7 @@ out:
 static int udf_symlink(struct inode *dir, struct dentry *dentry,
                       const char *symname)
 {
-       struct inode *inode = udf_new_inode(dir, S_IFLNK | S_IRWXUGO);
+       struct inode *inode = udf_new_inode(dir, S_IFLNK | 0777);
        struct pathComponent *pc;
        const char *compstart;
        struct extent_position epos = {};