From patchwork Wed Apr 4 16:42:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bradley Bolen X-Patchwork-Id: 895101 X-Patchwork-Delegate: hs@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Z06h3B+2"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40GZ431RBJz9s0W for ; Thu, 5 Apr 2018 04:19:31 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E8703C21DD3; Wed, 4 Apr 2018 18:18:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 90083C21E2C; Wed, 4 Apr 2018 18:17:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 25796C21D8A; Wed, 4 Apr 2018 16:43:19 +0000 (UTC) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by lists.denx.de (Postfix) with ESMTPS id 81EB8C21D56 for ; Wed, 4 Apr 2018 16:43:18 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id g20-v6so14789139plo.9 for ; Wed, 04 Apr 2018 09:43:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=UTA4Tv67jN/r6LdKN+0GU5i2nx3PzPDD4jbzzsW5qC8=; b=Z06h3B+28lW0nXO0bLGRmM8HTZXr/m8Xbz8gH0iQfniyyFgSizz2D1/W9/UUi2z8EM nzklPw2b5UHVc4Qsz5EfYwEJZbTv0myCfoJpFOamHQZ8Ly6hjCDPZGPe3sSrjrarV2Z0 GqMqv7HWe4Gp7rWgXkxDcIXoRrSl5zWogh6Q4p2OxeJMgnvmvyQIFhHk1aTu5oD46PzM sOg9kpZJq4I/gAfL+XESiHe31oHLKq+HrrbuOso9Qfip9aAb61FfKOB/wc5iCJ0DDNgB tjqLlitmiuP3KqNR9rujh//Q8g+A4Km+C3+tzR7wA/jAwb6C/fXIstQuFK3hcr1OMQYd DMFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UTA4Tv67jN/r6LdKN+0GU5i2nx3PzPDD4jbzzsW5qC8=; b=T4Z0E9m3PoX6r8DEfSqzBslnzj80mi07kjsJRjot+KDz94w4dLBiEMqN7X8CuEcjrw oYWqu5TFhk2ALDAAT2WjttYnqT5GSNbXVE99CizhcDhAgsNW8PrWp+/t6KCrGqwsKixq 9KTKpc6zkOYzgDW/O7pMbZWcHYSy4a7gzj7/th4WG/NftpP0HgUJujTHYGayN2Wpp/kG nUp2nuKFdHd8xlOK0uHKr0trlEKoN9p1PLL0dS0o8AwI8++uPjrA//gjUegupXuxUk8v FLbQ86HNby9tkAo9+9uX7mh+FJvVM5IAz1RSrotRW3XGNBZfgv32Jg4ZMUuLOwr53XAP YvHA== X-Gm-Message-State: AElRT7GyHICigQSs8h7AvXtJY0QoAvS5lJrsjyaFZU8U8HdcGjNw4nsm ISc28/BW8Rfu7G5YUDOXGMpz2+ac X-Google-Smtp-Source: AIpwx4/858AS4MfBRJOl5no31004DBfCRdCDGTj2ln26LP4h9CPCXijuD5k0KNTBwdpLiB9pzjehJg== X-Received: by 2002:a17:902:2e43:: with SMTP id q61-v6mr19014288plb.404.1522860196304; Wed, 04 Apr 2018 09:43:16 -0700 (PDT) Received: from saturn.lpdev.prtdev.lexmark.com ([192.146.101.90]) by smtp.gmail.com with ESMTPSA id o2sm10098259pgq.87.2018.04.04.09.43.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Apr 2018 09:43:15 -0700 (PDT) From: Bradley Bolen To: u-boot@lists.denx.de Date: Wed, 4 Apr 2018 12:42:16 -0400 Message-Id: <1522860136-23548-1-git-send-email-bradleybolen@gmail.com> X-Mailer: git-send-email 2.7.4 X-Mailman-Approved-At: Wed, 04 Apr 2018 18:17:33 +0000 Cc: trini@konsulko.com, Bradley Bolen Subject: [U-Boot] [PATCH] ubifs: Change value of mutex_is_locked() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The mutex lock and unlock functions are stubbed out and mutex_is_locked was 0. This caused asserts to fail in ubifs code when checking that the mutex was locked. For example, UBIFS assert failed in ubifs_change_lp at 540 UBIFS assert failed in ubifs_release_lprops at 278 Assume that the "mutex" is locked since that is the normal case when it is checked in the ubifs code. Signed-off-by: Bradley Bolen --- fs/ubifs/ubifs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 1d89465..70b794a 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -611,7 +611,7 @@ static inline ino_t parent_ino(struct dentry *dentry) /* misc.h */ #define mutex_lock_nested(...) #define mutex_unlock_nested(...) -#define mutex_is_locked(...) 0 +#define mutex_is_locked(...) 1 #endif /* Version of this UBIFS implementation */