Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52048862 authored by Ernestas Kulik's avatar Ernestas Kulik Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llite: use octal permissions 



Using octal permissions instead of symbolic ones is preferred.

Signed-off-by: default avatarErnestas Kulik <ernestas.kulik@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b40b4bc5

drivers/staging/lustre/lustre/llite/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/lustre/lustre/llite/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/lustre/lustre/llite/llite_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/lustre/lustre/llite/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -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)