diff --git a/[refs] b/[refs] index 8d3d68b518a5..530294a504a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a43a49066d36612f3bb46653cdb265a89c235eff +refs/heads/master: fc7c44f03d95f20b5446d06f5bb9605cddd53203 diff --git a/trunk/fs/dlm/user.c b/trunk/fs/dlm/user.c index 3e746a6ebac3..b0201ec325a7 100644 --- a/trunk/fs/dlm/user.c +++ b/trunk/fs/dlm/user.c @@ -115,8 +115,6 @@ static void compat_input(struct dlm_write_request *kb, static void compat_output(struct dlm_lock_result *res, struct dlm_lock_result32 *res32) { - res32->length = res->length - (sizeof(struct dlm_lock_result) - - sizeof(struct dlm_lock_result32)); res32->user_astaddr = (__u32)(long)res->user_astaddr; res32->user_astparam = (__u32)(long)res->user_astparam; res32->user_lksb = (__u32)(long)res->user_lksb;