| From bd59cdce11025dffce7d52ddabb13d6c44b13d74 Mon Sep 17 00:00:00 2001 |
| From: Frank Sorenson <sorenson@redhat.com> |
| Date: Wed, 12 Feb 2020 15:31:48 -0600 |
| Subject: [PATCH] cifs: Fix mode output in debugging statements |
| |
| commit f52aa79df43c4509146140de0241bc21a4a3b4c7 upstream. |
| |
| A number of the debug statements output file or directory mode |
| in hex. Change these to print using octal. |
| |
| Signed-off-by: Frank Sorenson <sorenson@redhat.com> |
| Signed-off-by: Steve French <stfrench@microsoft.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c |
| index 1d377b7f2860..130bdca9e568 100644 |
| --- a/fs/cifs/cifsacl.c |
| +++ b/fs/cifs/cifsacl.c |
| @@ -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)) |
| *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; |
| } |
| |
| @@ -632,7 +632,7 @@ static void mode_to_access_flags(umode_t mode, umode_t bits_to_use, |
| if (mode & S_IXUGO) |
| *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); |
| return; |
| } |
| diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c |
| index 238639887589..999718274e1f 100644 |
| --- a/fs/cifs/connect.c |
| +++ b/fs/cifs/connect.c |
| @@ -4007,7 +4007,7 @@ int cifs_setup_cifs_sb(struct smb_vol *pvolume_info, |
| cifs_sb->mnt_gid = pvolume_info->linux_gid; |
| cifs_sb->mnt_file_mode = pvolume_info->file_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->actimeo = pvolume_info->actimeo; |
| diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c |
| index 3d77ffc6c1b7..2887009aca32 100644 |
| --- a/fs/cifs/inode.c |
| +++ b/fs/cifs/inode.c |
| @@ -1579,7 +1579,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode) |
| struct TCP_Server_Info *server; |
| 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); |
| |
| cifs_sb = CIFS_SB(inode->i_sb); |
| -- |
| 2.7.4 |
| |
