| Message ID | 20200212213148.1143954-1-sorenson@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | cifs: Fix mode output in debugging statements | expand |
merged into cifs-2.6.git for-next On Wed, Feb 12, 2020 at 3:31 PM Frank Sorenson <sorenson@redhat.com> wrote: > > 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> > --- > 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 96ae72b556ac..58b4014fecb6 100644 > --- a/fs/cifs/cifsacl.c > +++ b/fs/cifs/cifsacl.c > @@ -601,7 +601,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; > } > > @@ -630,7 +630,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 05ea0e2b7e0e..071f5d6726e5 100644 > --- a/fs/cifs/connect.c > +++ b/fs/cifs/connect.c > @@ -4149,7 +4149,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 ca76a9287456..b3f3675e1878 100644 > --- a/fs/cifs/inode.c > +++ b/fs/cifs/inode.c > @@ -1649,7 +1649,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.14.4 >
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index 96ae72b556ac..58b4014fecb6 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c @@ -601,7 +601,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; } @@ -630,7 +630,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 05ea0e2b7e0e..071f5d6726e5 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -4149,7 +4149,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 ca76a9287456..b3f3675e1878 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -1649,7 +1649,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);
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> --- fs/cifs/cifsacl.c | 4 ++-- fs/cifs/connect.c | 2 +- fs/cifs/inode.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)