Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5558C282DE for ; Mon, 8 Apr 2019 05:48:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 91D092083E for ; Mon, 8 Apr 2019 05:48:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="30i86vTV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726369AbfDHFsS (ORCPT ); Mon, 8 Apr 2019 01:48:18 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:37986 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726068AbfDHFsS (ORCPT ); Mon, 8 Apr 2019 01:48:18 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x385j7K2029199; Mon, 8 Apr 2019 05:48:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=bpcuepE/sfIV6VxX60D/u4EXmRumruXZ3zEG1txNU3I=; b=30i86vTVEq41DvWWanxQ8FW/uYKKDx66FJGDxxoW4aFDRe5we8JZ0rzygzPZj4D9cL62 E57dMgVRrUPBeDyFP4IuRfVfHNBjZUIwkolwS5MPsqmXFCyq8AVGxhI+7wfAar4C4IfG CZU4SYSsCP21w0VFeaAA9Ftvs4/8ZiKkrX1JCXNSlysx2Qlayy0UNgW2W2iF73nG7qF7 /3TeI35xkV92TbFIpeecDjX15m/PCgYIl/3vB48R4hYDfgyn5E0jBk7/NwmX/UPVb+hB o0/yIW+0UCkZsOmzA9YYYpuTfLtILVy6bDgpgKdS5P7FAC5EJDbR5XjHFNxoBQz08U3J sA== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2130.oracle.com with ESMTP id 2rphme4704-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 08 Apr 2019 05:48:12 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x385lu2B065606; Mon, 8 Apr 2019 05:48:12 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3020.oracle.com with ESMTP id 2rpytauxne-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 08 Apr 2019 05:48:12 +0000 Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x385mADI028198; Mon, 8 Apr 2019 05:48:10 GMT Received: from [192.168.1.226] (/70.176.225.12) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 07 Apr 2019 22:48:10 -0700 Subject: Re: [PATCH 2/4] xfs: unlock inode when xfs_ioctl_setattr_get_trans can't get transaction To: "Darrick J. Wong" Cc: david@fromorbit.com, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-btrfs@vger.kernel.org References: <155466882175.633834.15261194784129614735.stgit@magnolia> <155466883603.633834.5683596746694707981.stgit@magnolia> From: Allison Henderson Message-ID: <0342fa7f-23f3-2acf-f40f-c485e66d4762@oracle.com> Date: Sun, 7 Apr 2019 22:48:08 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <155466883603.633834.5683596746694707981.stgit@magnolia> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9220 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904080053 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9220 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904080053 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Looks ok: Reviewed-by: Allison Henderson On 4/7/19 1:27 PM, Darrick J. Wong wrote: > From: Darrick J. Wong > > We passed an inode into xfs_ioctl_setattr_get_trans with join_flags > indicating which locks are held on that inode. If we can't allocate a > transaction then we need to unlock the inode before we bail out. > > Signed-off-by: Darrick J. Wong > --- > fs/xfs/xfs_ioctl.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > > diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c > index 6ecdbb3af7de..91938c4f3c67 100644 > --- a/fs/xfs/xfs_ioctl.c > +++ b/fs/xfs/xfs_ioctl.c > @@ -1142,7 +1142,7 @@ xfs_ioctl_setattr_get_trans( > > error = xfs_trans_alloc(mp, &M_RES(mp)->tr_ichange, 0, 0, 0, &tp); > if (error) > - return ERR_PTR(error); > + goto out_unlock; > > xfs_ilock(ip, XFS_ILOCK_EXCL); > xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL | join_flags); >