From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: darrick.wong@oracle.com
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
Subject: [PATCH 2/4] xfs: unlock inode when xfs_ioctl_setattr_get_trans can't get transaction
Date: Sun, 07 Apr 2019 13:27:16 -0700 [thread overview]
Message-ID: <155466883603.633834.5683596746694707981.stgit@magnolia> (raw)
In-Reply-To: <155466882175.633834.15261194784129614735.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
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 <darrick.wong@oracle.com>
---
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);
next prev parent reply other threads:[~2019-04-07 20:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-07 20:27 [PATCH v2 0/4] vfs: make immutable files actually immutable Darrick J. Wong
2019-04-07 20:27 ` [PATCH 1/4] mm/fs: don't allow writes to immutable files Darrick J. Wong
2019-04-07 20:27 ` Darrick J. Wong [this message]
2019-04-08 5:48 ` [PATCH 2/4] xfs: unlock inode when xfs_ioctl_setattr_get_trans can't get transaction Allison Henderson
2019-04-07 20:27 ` [PATCH 3/4] xfs: flush page mappings as part of setting immutable Darrick J. Wong
2019-04-08 5:49 ` Allison Henderson
2019-04-07 20:27 ` [PATCH 4/4] xfs: don't allow most setxattr to immutable files Darrick J. Wong
2019-04-08 5:57 ` Allison Henderson
2019-04-08 6:20 ` Amir Goldstein
2019-04-09 3:18 ` Darrick J. Wong
2019-04-09 3:19 ` [PATCH v2 " Darrick J. Wong
2019-04-09 8:24 ` Amir Goldstein
2019-04-17 19:01 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=155466883603.633834.5683596746694707981.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox