lkml.org 
[lkml]   [2016]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 23/80] staging: lustre: mdc: fixup MDS_SWAP_LAYOUTS ELC handling
    Date
    From: John L. Hammond <john.hammond@intel.com>

    In mdc_ioc_swap_layouts() cancel *any* unused locks with LAYOUT or
    XATTR IBITS set on the two files. (This matches the locks acquired in
    mdt_swap_layouts(). Previously only locks that conflicted with a CR
    LAYOUT lock were cancelled.)

    Signed-off-by: John L. Hammond <john.hammond@intel.com>
    Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4320
    Reviewed-on: http://review.whamcloud.com/9329
    Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
    Reviewed-by: Faccini Bruno <bruno.faccini@intel.com>
    Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
    Signed-off-by: James Simmons <jsimmons@infradead.org>
    ---
    drivers/staging/lustre/lustre/mdc/mdc_request.c | 6 ++++--
    1 files changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
    index 702ced9..030295f 100644
    --- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
    +++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
    @@ -1670,9 +1670,11 @@ static int mdc_ioc_swap_layouts(struct obd_export *exp,
    * with the request RPC to avoid extra RPC round trips
    */
    count = mdc_resource_get_unused(exp, &op_data->op_fid1, &cancels,
    - LCK_CR, MDS_INODELOCK_LAYOUT);
    + LCK_CR, MDS_INODELOCK_LAYOUT |
    + MDS_INODELOCK_XATTR);
    count += mdc_resource_get_unused(exp, &op_data->op_fid2, &cancels,
    - LCK_CR, MDS_INODELOCK_LAYOUT);
    + LCK_CR, MDS_INODELOCK_LAYOUT |
    + MDS_INODELOCK_XATTR);

    req = ptlrpc_request_alloc(class_exp2cliimp(exp),
    &RQF_MDS_SWAP_LAYOUTS);
    --
    1.7.1
    \
     
     \ /
      Last update: 2016-09-17 09:57    [W:4.054 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site