Message ID | 158861229393.340223.52639716251711847.stgit@warthog.procyon.org.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=3+KE=6S=vger.kernel.org=ceph-devel-owner@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9FBFE1668 for <patchwork-ceph-devel@patchwork.kernel.org>; Mon, 4 May 2020 17:11:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E7D524955 for <patchwork-ceph-devel@patchwork.kernel.org>; Mon, 4 May 2020 17:11:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BAaDD25E" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730345AbgEDRLn (ORCPT <rfc822;patchwork-ceph-devel@patchwork.kernel.org>); Mon, 4 May 2020 13:11:43 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:25381 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730337AbgEDRLl (ORCPT <rfc822;ceph-devel@vger.kernel.org>); Mon, 4 May 2020 13:11:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588612300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DmXq8JDI0UhNOOb8CsxILV4RCpzJjibV/E3VZDgeUfY=; b=BAaDD25Eyn9KuWjPy+4ULut9c6ASom5oar9hX6/D+LP1CmndSfzD+4Vs8iTYbOjIkUhV8T uPU9b7xM0HbOUmBRlivcuMDajb1fpRCO4bGyB9Ck6OH44/ypvlLiOWJLHQtpuZUxTQuYuw f8sW2jyGC/B8NbJcJ2bZtEMMts2pAkc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-296-wu8xn1tOOVi5f4hspptw8g-1; Mon, 04 May 2020 13:11:38 -0400 X-MC-Unique: wu8xn1tOOVi5f4hspptw8g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25264800D24; Mon, 4 May 2020 17:11:37 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-118-225.rdu2.redhat.com [10.10.118.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBD1860BEC; Mon, 4 May 2020 17:11:34 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [RFC PATCH 27/61] fscache: Recast assertion in terms of cookie not being an index From: David Howells <dhowells@redhat.com> To: Trond Myklebust <trondmy@hammerspace.com>, Anna Schumaker <anna.schumaker@netapp.com>, Steve French <sfrench@samba.org>, Jeff Layton <jlayton@redhat.com> Cc: dhowells@redhat.com, Matthew Wilcox <willy@infradead.org>, Alexander Viro <viro@zeniv.linux.org.uk>, linux-afs@lists.infradead.org, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs-developer@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 04 May 2020 18:11:33 +0100 Message-ID: <158861229393.340223.52639716251711847.stgit@warthog.procyon.org.uk> In-Reply-To: <158861203563.340223.7585359869938129395.stgit@warthog.procyon.org.uk> References: <158861203563.340223.7585359869938129395.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.21 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: <ceph-devel.vger.kernel.org> X-Mailing-List: ceph-devel@vger.kernel.org |
Series |
fscache, cachefiles: Rewrite the I/O interface in terms of kiocb/iov_iter
|
expand
|
diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c index 284017fe4a5d..f02ed34beb0c 100644 --- a/fs/fscache/cookie.c +++ b/fs/fscache/cookie.c @@ -485,7 +485,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie, loff_t new_size) * there, and if it's doing that, it may as well just retire the * cookie. */ - ASSERTCMP(cookie->type, ==, FSCACHE_COOKIE_TYPE_DATAFILE); + ASSERTCMP(cookie->type, !=, FSCACHE_COOKIE_TYPE_INDEX); spin_lock(&cookie->lock); cookie->object_size = new_size;
Recast assertion in terms of cookie not being an index rather than being a datafile. Signed-off-by: David Howells <dhowells@redhat.com> --- fs/fscache/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)