]> git.baikalelectronics.ru Git - kernel.git/commit
xfs: fix error handling in xfs_qm_log_quotaoff()
authorBrian Foster <bfoster@redhat.com>
Fri, 28 Nov 2014 03:00:53 +0000 (14:00 +1100)
committerDave Chinner <david@fromorbit.com>
Fri, 28 Nov 2014 03:00:53 +0000 (14:00 +1100)
commit050f9a08866fe29674348611b4fadb3c1f7d62c7
tree772d6cfe61662d386549004c415eac8713d65b65
parent3f401e104331964237ad452934d4139867adc454
xfs: fix error handling in xfs_qm_log_quotaoff()

The error handling in xfs_qm_log_quotaoff() has a couple problems. If
xfs_trans_commit() fails, we fall through to the error block and call
xfs_trans_cancel(). This is incorrect on commit failure. If
xfs_trans_reserve() fails, we jump to the error block, cancel the tp and
restore the superblock qflags to oldsbqflag. However, oldsbqflag has
been initialized to zero and not yet updated from the original flags so
we set the flags to zero.

Fix up the error handling in xfs_qm_log_quotaoff() to not restore flags
if they haven't been modified and not cancel the tp on commit failure.
Remove the flag restore code altogether because commit error is the only
failure condition and we don't know whether the transaction made it to
disk.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
fs/xfs/xfs_qm_syscalls.c