lkml.org 
[lkml]   [2018]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 290/366] ufs: deal with nfsd/iget races
    3.16.60-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Al Viro <viro@zeniv.linux.org.uk>

    commit e4502c63f56aeca887ced37f24e0def1ef11cec8 upstream.

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    fs/ufs/ialloc.c | 6 +++++-
    fs/ufs/namei.c | 4 ++++
    2 files changed, 9 insertions(+), 1 deletion(-)

    --- a/fs/ufs/ialloc.c
    +++ b/fs/ufs/ialloc.c
    @@ -298,7 +298,10 @@ cg_found:
    ufsi->i_oeftflag = 0;
    ufsi->i_dir_start_lookup = 0;
    memset(&ufsi->i_u1, 0, sizeof(ufsi->i_u1));
    - insert_inode_hash(inode);
    + if (insert_inode_locked(inode) < 0) {
    + err = -EIO;
    + goto failed;
    + }
    mark_inode_dirty(inode);

    if (uspi->fs_magic == UFS2_MAGIC) {
    @@ -337,6 +340,7 @@ cg_found:
    fail_remove_inode:
    mutex_unlock(&sbi->s_lock);
    clear_nlink(inode);
    + unlock_new_inode(inode);
    iput(inode);
    UFSD("EXIT (FAILED): err %d\n", err);
    return ERR_PTR(err);
    --- a/fs/ufs/namei.c
    +++ b/fs/ufs/namei.c
    @@ -38,10 +38,12 @@ static inline int ufs_add_nondir(struct
    {
    int err = ufs_add_link(dentry, inode);
    if (!err) {
    + unlock_new_inode(inode);
    d_instantiate(dentry, inode);
    return 0;
    }
    inode_dec_link_count(inode);
    + unlock_new_inode(inode);
    iput(inode);
    return err;
    }
    @@ -155,6 +157,7 @@ out_notlocked:

    out_fail:
    inode_dec_link_count(inode);
    + unlock_new_inode(inode);
    iput(inode);
    goto out;
    }
    @@ -211,6 +214,7 @@ out:
    out_fail:
    inode_dec_link_count(inode);
    inode_dec_link_count(inode);
    + unlock_new_inode(inode);
    iput (inode);
    out_dir:
    inode_dec_link_count(dir);
    \
     
     \ /
      Last update: 2018-10-14 17:52    [W:4.139 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site