lkml.org 
[lkml]   [2020]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 08/72] cifs: Fix mode output in debugging statements
    Date
    From: Frank Sorenson <sorenson@redhat.com>

    [ 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: Frank Sorenson <sorenson@redhat.com>
    Signed-off-by: Steve French <stfrench@microsoft.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/cifs/cifsacl.c | 4 ++--
    fs/cifs/connect.c | 2 +-
    fs/cifs/inode.c | 2 +-
    3 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
    index 3f93125916bf0..f5b87a8f75c47 100644
    --- a/fs/cifs/cifsacl.c
    +++ b/fs/cifs/cifsacl.c
    @@ -480,7 +480,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;
    }

    @@ -509,7 +509,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 4bde8acca455c..cf104bbe30a14 100644
    --- a/fs/cifs/connect.c
    +++ b/fs/cifs/connect.c
    @@ -3402,7 +3402,7 @@ void 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 0a219545940d9..8827de2ba7bef 100644
    --- a/fs/cifs/inode.c
    +++ b/fs/cifs/inode.c
    @@ -1540,7 +1540,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.20.1


    \
     
     \ /
      Last update: 2020-03-10 14:38    [W:4.245 / U:0.584 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site