Commit 53e3ccfd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs 

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix force shutdown handling in xfs_end_io
  xfs: constify xfs_item_ops
  xfs: Fix possible memory corruption in xfs_readlink
parents 5e442a49 810627d9

fs/xfs/xfs_aops.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ xfs_end_io( 
	int		error = 0;



	if (XFS_FORCED_SHUTDOWN(ip->i_mount)) {

		error = -EIO;

		ioend->io_error = -EIO;

		goto done;

	}

	if (ioend->io_error)

fs/xfs/xfs_buf_item.c

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ xfs_buf_item_committing( 
/*

 * This is the ops vector shared by all buf log items.

 */

static struct xfs_item_ops xfs_buf_item_ops = {

static const struct xfs_item_ops xfs_buf_item_ops = {

	.iop_size	= xfs_buf_item_size,

	.iop_format	= xfs_buf_item_format,

	.iop_pin	= xfs_buf_item_pin,

fs/xfs/xfs_dquot_item.c

+3 −3
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ xfs_qm_dquot_logitem_committing( 
/*

 * This is the ops vector for dquots

 */

static struct xfs_item_ops xfs_dquot_item_ops = {

static const struct xfs_item_ops xfs_dquot_item_ops = {

	.iop_size	= xfs_qm_dquot_logitem_size,

	.iop_format	= xfs_qm_dquot_logitem_format,

	.iop_pin	= xfs_qm_dquot_logitem_pin,
@@ -483,7 +483,7 @@ xfs_qm_qoff_logitem_committing( 
{

}



static struct xfs_item_ops xfs_qm_qoffend_logitem_ops = {

static const struct xfs_item_ops xfs_qm_qoffend_logitem_ops = {

	.iop_size	= xfs_qm_qoff_logitem_size,

	.iop_format	= xfs_qm_qoff_logitem_format,

	.iop_pin	= xfs_qm_qoff_logitem_pin,
@@ -498,7 +498,7 @@ static struct xfs_item_ops xfs_qm_qoffend_logitem_ops = { 
/*

 * This is the ops vector shared by all quotaoff-start log items.

 */

static struct xfs_item_ops xfs_qm_qoff_logitem_ops = {

static const struct xfs_item_ops xfs_qm_qoff_logitem_ops = {

	.iop_size	= xfs_qm_qoff_logitem_size,

	.iop_format	= xfs_qm_qoff_logitem_format,

	.iop_pin	= xfs_qm_qoff_logitem_pin,

fs/xfs/xfs_extfree_item.c

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ xfs_efi_item_committing( 
/*

 * This is the ops vector shared by all efi log items.

 */

static struct xfs_item_ops xfs_efi_item_ops = {

static const struct xfs_item_ops xfs_efi_item_ops = {

	.iop_size	= xfs_efi_item_size,

	.iop_format	= xfs_efi_item_format,

	.iop_pin	= xfs_efi_item_pin,
@@ -477,7 +477,7 @@ xfs_efd_item_committing( 
/*

 * This is the ops vector shared by all efd log items.

 */

static struct xfs_item_ops xfs_efd_item_ops = {

static const struct xfs_item_ops xfs_efd_item_ops = {

	.iop_size	= xfs_efd_item_size,

	.iop_format	= xfs_efd_item_format,

	.iop_pin	= xfs_efd_item_pin,

fs/xfs/xfs_inode_item.c

+1 −1
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ xfs_inode_item_committing( 
/*

 * This is the ops vector shared by all buf log items.

 */

static struct xfs_item_ops xfs_inode_item_ops = {

static const struct xfs_item_ops xfs_inode_item_ops = {

	.iop_size	= xfs_inode_item_size,

	.iop_format	= xfs_inode_item_format,

	.iop_pin	= xfs_inode_item_pin,