From patchwork Thu Jul 13 11:33:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9838261 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 59DAB603F3 for ; Thu, 13 Jul 2017 11:33:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49E15286D4 for ; Thu, 13 Jul 2017 11:33:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EC66286E7; Thu, 13 Jul 2017 11:33:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8A32286D4 for ; Thu, 13 Jul 2017 11:33:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751280AbdGMLdY (ORCPT ); Thu, 13 Jul 2017 07:33:24 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:48816 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751330AbdGMLdX (ORCPT ); Thu, 13 Jul 2017 07:33:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=CXQH82lj84b6tUcjpTFrmG4Qb4bhpMFynmmmTqAdWQk=; b=YgvKk7Za4m/p+V3QwgqoqVpt7 ErHwGdmmCN90NiPuJahQZ6cvodoT3bvvpTve+pfSeKltUsB4HCpLzEFWR0fuNZfNM4zQ09ZVlHxml L9rSLiiNP0fS9+SIcfghK6GWxjWXtheC37RBAO8am3BpSh7p0y9wS4rIUamVS5WVL9UzKmvutMSxW s9oxH7g8LmG1fav4bQFUJwkU5WhNt+BR0OW7RGvxdHt+XL1yUDLvEzKlpPLdGLi8zhOjWXxp7rbz/ T1gkXLa56rNzDqbo/bR2HWXWF7CbOloUjYi0ltFYNNh/sTCRMi1KaClft0tdwUN2BsQjlLK408hmM 3reOkKZlg==; Received: from clnet-p099-196.ikbnet.co.at ([83.175.99.196] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dVcMv-0001oV-Dc for linux-xfs@vger.kernel.org; Thu, 13 Jul 2017 11:33:17 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Subject: [PATCH 3/4] xfs: assert locking precondition in xfs_readlink_bmap_ilocked Date: Thu, 13 Jul 2017 13:33:03 +0200 Message-Id: <20170713113304.8079-4-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170713113304.8079-1-hch@lst.de> References: <20170713113304.8079-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_symlink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c index 12cd9cf7de41..23a50d7aa46a 100644 --- a/fs/xfs/xfs_symlink.c +++ b/fs/xfs/xfs_symlink.c @@ -61,6 +61,8 @@ xfs_readlink_bmap_ilocked( int fsblocks = 0; int offset; + ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)); + fsblocks = xfs_symlink_blocks(mp, pathlen); error = xfs_bmapi_read(ip, 0, fsblocks, mval, &nmaps, 0); if (error)