staging: lustre: llite: use octal permissions

Using octal permissions instead of symbolic ones is preferred.

Signed-off-by: Ernestas Kulik <ernestas.kulik@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
index ea5d247a3f70bc8817549687c4fcd54d09cf1d92..526fea266926cf1e60e40acff533a1a39654e035 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@ -432,7 +432,7 @@ static int ll_dir_setdirstripe(struct inode *parent, struct lmv_user_md *lump,
 
        if (!IS_POSIXACL(parent) || !exp_connect_umask(ll_i2mdexp(parent)))
                mode &= ~current_umask();
-       mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR;
+       mode = (mode & (0777 | S_ISVTX)) | S_IFDIR;
        op_data = ll_prep_md_op_data(NULL, parent, NULL, dirname,
                                     strlen(dirname), mode, LUSTRE_OPC_MKDIR,
                                     lump);

diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
index d93f06abd13c2ee7f19a4cb6b76a10d16a290134..a17118876555997ee0798f768c7d32acb0b6c738 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -1883,7 +1883,7 @@ static int ll_hsm_import(struct inode *inode, struct file *file,
                goto free_hss;
        }
 
-       attr->ia_mode = hui->hui_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
+       attr->ia_mode = hui->hui_mode & 0777;
        attr->ia_mode |= S_IFREG;
        attr->ia_uid = make_kuid(&init_user_ns, hui->hui_uid);
        attr->ia_gid = make_kgid(&init_user_ns, hui->hui_gid);

diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index 25f5aed97f63ca98619f27109e8a55b1a580ed23..9cb4909e3b86b2ed47139e624e4cf418a6f0fb10 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -1599,7 +1599,7 @@ int ll_setattr(struct dentry *de, struct iattr *attr)
        if (((attr->ia_valid & (ATTR_MODE | ATTR_FORCE | ATTR_SIZE)) ==
                               (ATTR_SIZE | ATTR_MODE)) &&
            (((mode & S_ISUID) && !(attr->ia_mode & S_ISUID)) ||
-            (((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) &&
+            (((mode & (S_ISGID | 0010)) == (S_ISGID | 0010)) &&
              !(attr->ia_mode & S_ISGID))))
                attr->ia_valid |= ATTR_FORCE;
 
@@ -1610,7 +1610,7 @@ int ll_setattr(struct dentry *de, struct iattr *attr)
                attr->ia_valid |= ATTR_KILL_SUID;
 
        if ((attr->ia_valid & ATTR_MODE) &&
-           ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) &&
+           ((mode & (S_ISGID | 0010)) == (S_ISGID | 0010)) &&
            !(attr->ia_mode & S_ISGID) &&
            !(attr->ia_valid & ATTR_KILL_SGID))
                attr->ia_valid |= ATTR_KILL_SGID;

diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index a8f4e7fb0a461afd64b23cfaf81090400470b075..f925656f11c9a5548573bc6ee9e973d61e46efe4 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -1041,7 +1041,7 @@ static int ll_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 
        if (!IS_POSIXACL(dir) || !exp_connect_umask(ll_i2mdexp(dir)))
                mode &= ~current_umask();
-       mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR;
+       mode = (mode & (0777 | S_ISVTX)) | S_IFDIR;
 
        err = ll_new_node(dir, dentry, NULL, mode, 0, LUSTRE_OPC_MKDIR);
        if (!err)
@@ -1089,7 +1089,7 @@ static int ll_symlink(struct inode *dir, struct dentry *dentry,
        CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir="DFID"(%p),target=%.*s\n",
               dentry, PFID(ll_inode2fid(dir)), dir, 3000, oldname);
 
-       err = ll_new_node(dir, dentry, oldname, S_IFLNK | S_IRWXUGO,
+       err = ll_new_node(dir, dentry, oldname, S_IFLNK | 0777,
                          0, LUSTRE_OPC_SYMLINK);
 
        if (!err)