mirror of
https://github.com/torvalds/linux.git
synced 2026-06-02 19:43:40 +02:00
xfs: xfs_qm_dqattach_one is never called with a non-NULL *IO_idqpp
The caller already checks that, so replace the handling of this case with an assert that it does not happen. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
parent
0494f04643
commit
d0f93c0d7c
|
|
@ -297,19 +297,8 @@ xfs_qm_dqattach_one(
|
|||
struct xfs_dquot *dqp;
|
||||
int error;
|
||||
|
||||
ASSERT(!*IO_idqpp);
|
||||
xfs_assert_ilocked(ip, XFS_ILOCK_EXCL);
|
||||
error = 0;
|
||||
|
||||
/*
|
||||
* See if we already have it in the inode itself. IO_idqpp is &i_udquot
|
||||
* or &i_gdquot. This made the code look weird, but made the logic a lot
|
||||
* simpler.
|
||||
*/
|
||||
dqp = *IO_idqpp;
|
||||
if (dqp) {
|
||||
trace_xfs_dqattach_found(dqp);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Find the dquot from somewhere. This bumps the reference count of
|
||||
|
|
|
|||
|
|
@ -1399,7 +1399,6 @@ DEFINE_DQUOT_EVENT(xfs_dqadjust);
|
|||
DEFINE_DQUOT_EVENT(xfs_dqreclaim_want);
|
||||
DEFINE_DQUOT_EVENT(xfs_dqreclaim_busy);
|
||||
DEFINE_DQUOT_EVENT(xfs_dqreclaim_done);
|
||||
DEFINE_DQUOT_EVENT(xfs_dqattach_found);
|
||||
DEFINE_DQUOT_EVENT(xfs_dqattach_get);
|
||||
DEFINE_DQUOT_EVENT(xfs_dqalloc);
|
||||
DEFINE_DQUOT_EVENT(xfs_dqtobp_read);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user