]> www.infradead.org Git - users/jedix/linux-maple.git/commit
xfs: remove the flags argument to xfs_trans_cancel
authorChristoph Hellwig <hch@lst.de>
Thu, 4 Jun 2015 03:47:56 +0000 (13:47 +1000)
committerDan Duval <dan.duval@oracle.com>
Wed, 7 Dec 2016 15:13:41 +0000 (10:13 -0500)
commit95ae1e7206b292608e39cb18fd040cbf20cb7edc
treeeea521eb641742a8d6c504c6ba49f9eb244fb436
parentb7c7a7275ffc8736a1b15276e202880d0ffef2a1
xfs: remove the flags argument to xfs_trans_cancel

Orabug: 22913653

xfs_trans_cancel takes two flags arguments: XFS_TRANS_RELEASE_LOG_RES and
XFS_TRANS_ABORT.  Both of them are a direct product of the transaction
state, and can be deducted:

 - any dirty transaction needs XFS_TRANS_ABORT to be properly canceled,
   and XFS_TRANS_ABORT is a noop for a transaction that is not dirty.
 - any transaction with a permanent log reservation needs
   XFS_TRANS_RELEASE_LOG_RES to be properly canceled, and passing
   XFS_TRANS_RELEASE_LOG_RES for a transaction without a permanent
   log reservation is invalid.

So just remove the flags argument and do the right thing.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Dan Duval <dan.duval@oracle.com>
(cherry picked from commit 4906e21545814e4129595118287a2f1415483c0b)

Conflict:

fs/xfs/xfs_attr_inactive.c
22 files changed:
fs/xfs/libxfs/xfs_attr.c
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/libxfs/xfs_sb.c
fs/xfs/libxfs/xfs_shared.h
fs/xfs/xfs_aops.c
fs/xfs/xfs_attr_inactive.c
fs/xfs/xfs_bmap_util.c
fs/xfs/xfs_dquot.c
fs/xfs/xfs_file.c
fs/xfs/xfs_fsops.c
fs/xfs/xfs_inode.c
fs/xfs/xfs_ioctl.c
fs/xfs/xfs_iomap.c
fs/xfs/xfs_iops.c
fs/xfs/xfs_log_recover.c
fs/xfs/xfs_pnfs.c
fs/xfs/xfs_qm.c
fs/xfs/xfs_qm_syscalls.c
fs/xfs/xfs_rtalloc.c
fs/xfs/xfs_symlink.c
fs/xfs/xfs_trans.c
fs/xfs/xfs_trans.h