Message ID | 2015051611394221344336@h3c.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <ocfs2-devel-bounces@oss.oracle.com> X-Original-To: patchwork-ocfs2-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DD0A4C0432 for <patchwork-ocfs2-devel@patchwork.kernel.org>; Sat, 16 May 2015 03:41:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A44CF20569 for <patchwork-ocfs2-devel@patchwork.kernel.org>; Sat, 16 May 2015 03:41:32 +0000 (UTC) Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 390F92055C for <patchwork-ocfs2-devel@patchwork.kernel.org>; Sat, 16 May 2015 03:41:30 +0000 (UTC) Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t4G3ehx6019462 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 16 May 2015 03:40:44 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t4G3efcZ029480 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 16 May 2015 03:40:41 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from <ocfs2-devel-bounces@oss.oracle.com>) id 1YtSxt-0003nr-Kr; Fri, 15 May 2015 20:40:41 -0700 Received: from userv0021.oracle.com ([156.151.31.71]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from <zhang.guanghui@h3c.com>) id 1YtSxE-0003hZ-LX for ocfs2-devel@oss.oracle.com; Fri, 15 May 2015 20:40:00 -0700 Received: from aserp1020.oracle.com (aserp1020.oracle.com [141.146.126.67]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t4G3dxtb014736 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for <ocfs2-devel@oss.oracle.com>; Sat, 16 May 2015 03:40:00 GMT Received: from userp2030.oracle.com (userp2030.oracle.com [156.151.31.89]) by aserp1020.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t4G3dvE7023148 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for <ocfs2-devel@oss.oracle.com>; Sat, 16 May 2015 03:39:58 GMT Received: from pps.filterd (userp2030.oracle.com [127.0.0.1]) by userp2030.oracle.com (8.14.7/8.14.7) with SMTP id t4G3dqi5038237 for <ocfs2-devel@oss.oracle.com>; Sat, 16 May 2015 03:39:57 GMT Received: from h3cmg01-ex.h3c.com (smtp.h3c.com [221.12.31.13] (may be forged)) by userp2030.oracle.com with ESMTP id 1udpbn7kcw-1 for <ocfs2-devel@oss.oracle.com>; Sat, 16 May 2015 03:39:57 +0000 Received: from H3CHUB04-EX.srv.huawei-3com.com (unknown [10.63.20.170]) by h3cmg01-ex.h3c.com with smtp id 1e9e_0795_79068f55_9c8a_49f8_a5db_cd23f2a4d7f1; Sat, 16 May 2015 11:39:53 +0800 Received: from H3CMLB12-EX.srv.huawei-3com.com ([fe80::f091:bd11:f0a9:5cbe]) by H3CHUB04-EX.srv.huawei-3com.com ([fe80::5939:f6db:b05e:eaba%11]) with mapi id 14.01.0355.002; Sat, 16 May 2015 11:39:43 +0800 From: Zhangguanghui <zhang.guanghui@h3c.com> To: "ocfs2-devel@oss.oracle.com" <ocfs2-devel@oss.oracle.com> Thread-Topic: ocfs2/dlm: Ignore LVBs of locks Thread-Index: AdCPf3p8KBMGQIOuRxCrqgBn9iWNxw== Date: Sat, 16 May 2015 03:39:42 +0000 Message-ID: <2015051611394221344336@h3c.com> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.153.28.107] MIME-Version: 1.0 X-ServerName: [221.12.31.13] X-Proofpoint-Virus-Version: vendor=nai engine=5700 definitions=7802 signatures=670584 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1505160050 Subject: [Ocfs2-devel] ocfs2/dlm: Ignore LVBs of locks X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: <ocfs2-devel.oss.oracle.com> List-Unsubscribe: <https://oss.oracle.com/mailman/listinfo/ocfs2-devel>, <mailto:ocfs2-devel-request@oss.oracle.com?subject=unsubscribe> List-Archive: <http://oss.oracle.com/pipermail/ocfs2-devel> List-Post: <mailto:ocfs2-devel@oss.oracle.com> List-Help: <mailto:ocfs2-devel-request@oss.oracle.com?subject=help> List-Subscribe: <https://oss.oracle.com/mailman/listinfo/ocfs2-devel>, <mailto:ocfs2-devel-request@oss.oracle.com?subject=subscribe> Content-Type: multipart/mixed; boundary="===============7904436913808628060==" Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: aserv0021.oracle.com [141.146.126.233] X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_50, HTML_FONT_FACE_BAD, HTML_FONT_LOW_CONTRAST, HTML_MESSAGE, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
--- dlmrecovery.c 2014-12-17 01:39:45.000000000 +0800 +++ dlmrecovery0.c 2015-05-16 10:59:59.683924862 +0800 @@ -1215,7 +1215,10 @@ lock->lockres->lockname.len, lock->lockres->lockname.name, lock->ml.node); dlm_print_one_lock_resource(lock->lockres); - BUG(); + + /* Ensure the lvb copied for migration matches the first valid locks */ + memcpy(lock->lksb->lvb, mres->lvb, DLM_LVB_LEN); + return; }