lkml.org 
[lkml]   [2021]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RFC 13/13] ext4: simplify the printing with '%pD' specifier
    Date
    After the behavior of '%pD' is changed to print the full path of file,
    the log printing can be simplified.

    The error case is well handled in d_path_unsafe(), the error string
    would be copied in '%pD' buffer, no need to additionally handle IS_ERR().

    Cc: "Theodore Ts'o" <tytso@mit.edu>
    Cc: Andreas Dilger <adilger.kernel@dilger.ca>
    Cc: linux-ext4@vger.kernel.org
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Jia He <justin.he@arm.com>
    ---
    fs/ext4/super.c | 12 ++++--------
    1 file changed, 4 insertions(+), 8 deletions(-)

    diff --git a/fs/ext4/super.c b/fs/ext4/super.c
    index dfa09a277b56..89ad5a334b80 100644
    --- a/fs/ext4/super.c
    +++ b/fs/ext4/super.c
    @@ -803,31 +803,27 @@ void __ext4_error_file(struct file *file, const char *function,
    va_list args;
    struct va_format vaf;
    struct inode *inode = file_inode(file);
    - char pathname[80], *path;

    if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))
    return;

    trace_ext4_error(inode->i_sb, function, line);
    if (ext4_error_ratelimit(inode->i_sb)) {
    - path = file_path(file, pathname, sizeof(pathname));
    - if (IS_ERR(path))
    - path = "(unknown)";
    va_start(args, fmt);
    vaf.fmt = fmt;
    vaf.va = &args;
    if (block)
    printk(KERN_CRIT
    "EXT4-fs error (device %s): %s:%d: inode #%lu: "
    - "block %llu: comm %s: path %s: %pV\n",
    + "block %llu: comm %s: path %pD: %pV\n",
    inode->i_sb->s_id, function, line, inode->i_ino,
    - block, current->comm, path, &vaf);
    + block, current->comm, file, &vaf);
    else
    printk(KERN_CRIT
    "EXT4-fs error (device %s): %s:%d: inode #%lu: "
    - "comm %s: path %s: %pV\n",
    + "comm %s: path %pD: %pV\n",
    inode->i_sb->s_id, function, line, inode->i_ino,
    - current->comm, path, &vaf);
    + current->comm, file, &vaf);
    va_end(args);
    }
    ext4_handle_error(inode->i_sb, false, EFSCORRUPTED, inode->i_ino, block,
    --
    2.17.1
    \
     
     \ /
      Last update: 2021-07-15 05:17    [W:4.086 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site