lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 142/235] NFSv4: Fix a tracepoint Oops in initiate_file_draining()
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Trond Myklebust <trondmy@gmail.com>

    commit 2a534a7473bf4e7f1c12805113f80c795fc8e89a upstream.

    Now that the value of 'ino' can be NULL or an ERR_PTR(), we need to
    change the test in the tracepoint.

    Fixes: ce5624f7e6675 ("NFSv4: Return NFS4ERR_DELAY when a layout fails...")
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Cc: stable@vger.kernel.org # v4.17+
    Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/nfs/nfs4trace.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/fs/nfs/nfs4trace.h
    +++ b/fs/nfs/nfs4trace.h
    @@ -1194,7 +1194,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_c
    TP_fast_assign(
    __entry->error = error;
    __entry->fhandle = nfs_fhandle_hash(fhandle);
    - if (inode != NULL) {
    + if (!IS_ERR_OR_NULL(inode)) {
    __entry->fileid = NFS_FILEID(inode);
    __entry->dev = inode->i_sb->s_dev;
    } else {

    \
     
     \ /
      Last update: 2018-09-24 14:50    [W:2.204 / U:3.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site