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

Commit b6b77b5e authored by Frank Sorenson's avatar Frank Sorenson Committed by Greg Kroah-Hartman
Browse files

cifs: Fix mode output in debugging statements 



[ Upstream commit f52aa79df43c4509146140de0241bc21a4a3b4c7 ]

A number of the debug statements output file or directory mode
in hex.  Change these to print using octal.

Signed-off-by: default avatarFrank Sorenson <sorenson@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ffbd6a62

fs/cifs/cifsacl.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -603,7 +603,7 @@ static void access_flags_to_mode(__le32 ace_flags, int type, umode_t *pmode, 
			((flags & FILE_EXEC_RIGHTS) == FILE_EXEC_RIGHTS))

			((flags & FILE_EXEC_RIGHTS) == FILE_EXEC_RIGHTS))

		*pmode |= (S_IXUGO & (*pbits_to_set));

		*pmode |= (S_IXUGO & (*pbits_to_set));





	cifs_dbg(NOISY, "access flags 0x%x mode now 0x%x\n", flags, *pmode);

	cifs_dbg(NOISY, "access flags 0x%x mode now %04o\n", flags, *pmode);

	return;

	return;

}

}
@@ -632,7 +632,7 @@ static void mode_to_access_flags(umode_t mode, umode_t bits_to_use, 
	if (mode & S_IXUGO)

	if (mode & S_IXUGO)

		*pace_flags |= SET_FILE_EXEC_RIGHTS;

		*pace_flags |= SET_FILE_EXEC_RIGHTS;





	cifs_dbg(NOISY, "mode: 0x%x, access flags now 0x%x\n",

	cifs_dbg(NOISY, "mode: %04o, access flags now 0x%x\n",

		 mode, *pace_flags);

		 mode, *pace_flags);

	return;

	return;

}

}

fs/cifs/connect.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3794,7 +3794,7 @@ int cifs_setup_cifs_sb(struct smb_vol *pvolume_info, 
	cifs_sb->mnt_gid = pvolume_info->linux_gid;

	cifs_sb->mnt_gid = pvolume_info->linux_gid;

	cifs_sb->mnt_file_mode = pvolume_info->file_mode;

	cifs_sb->mnt_file_mode = pvolume_info->file_mode;

	cifs_sb->mnt_dir_mode = pvolume_info->dir_mode;

	cifs_sb->mnt_dir_mode = pvolume_info->dir_mode;

	cifs_dbg(FYI, "file mode: 0x%hx  dir mode: 0x%hx\n",

	cifs_dbg(FYI, "file mode: %04ho  dir mode: %04ho\n",

		 cifs_sb->mnt_file_mode, cifs_sb->mnt_dir_mode);

		 cifs_sb->mnt_file_mode, cifs_sb->mnt_dir_mode);





	cifs_sb->actimeo = pvolume_info->actimeo;

	cifs_sb->actimeo = pvolume_info->actimeo;

fs/cifs/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1579,7 +1579,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode) 
	struct TCP_Server_Info *server;

	struct TCP_Server_Info *server;

	char *full_path;

	char *full_path;





	cifs_dbg(FYI, "In cifs_mkdir, mode = 0x%hx inode = 0x%p\n",

	cifs_dbg(FYI, "In cifs_mkdir, mode = %04ho inode = 0x%p\n",

		 mode, inode);

		 mode, inode);





	cifs_sb = CIFS_SB(inode->i_sb);

	cifs_sb = CIFS_SB(inode->i_sb);