lkml.org 
[lkml]   [2013]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/26] staging/lustre/ldlm: refine LU-2665 patch for POSIX compliance
    Date
    From: Bruno Faccini <bruno.faccini@intel.com>

    Follow-on to patch introduced to fix LU-2665 ticket (Gerrit
    Change at http://review.whamcloud.com/6415 with Change-Id:
    I8faa331712abeadee46eabe111ee1c23a05840d5).
    Original patch introduced regressions against POSIX test suite
    (fcntl.18/fcntl.35 tests in LSB-VSX POSIX test suite at
    http://www.opengroup.org/testing/linux-test/lsb-vsx.html),
    so the idea is to only resend F_UNLCKs to have both LU-2665 bug
    and POSIX test suite happy.

    Lustre-change: http://review.whamcloud.com/7453
    Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3701
    Signed-off-by: Bruno Faccini <bruno.faccini@intel.com>
    Reviewed-by: Bobi Jam <bobijam@gmail.com>
    Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
    Signed-off-by: Peng Tao <bergwolf@gmail.com>
    Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
    ---
    drivers/staging/lustre/lustre/mdc/mdc_locks.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
    index b5a3f26..2896147 100644
    --- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c
    +++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
    @@ -882,7 +882,9 @@ resend:
    can not rely on caller and this mainly for F_UNLCKs
    (explicits or automatically generated by Kernel to clean
    current FLocks upon exit) that can't be trashed */
    - if ((rc == -EINTR) || (rc == -ETIMEDOUT))
    + if (((rc == -EINTR) || (rc == -ETIMEDOUT)) &&
    + (einfo->ei_type == LDLM_FLOCK) &&
    + (einfo->ei_mode == LCK_NL))
    goto resend;
    return rc;
    }
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-11-14 19:01    [W:2.379 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site