Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e14e49a authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-misc-fixes-for-4.4-3' into for-next

parents 264e89ad 7a29ac47

fs/xfs/xfs_acl.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -163,6 +163,7 @@ xfs_get_acl(struct inode *inode, int type) 
		 */

		 */

		if (error == -ENOATTR)

		if (error == -ENOATTR)

			goto out_update_cache;

			goto out_update_cache;

		acl = ERR_PTR(error);

		goto out;

		goto out;

	}

	}

fs/xfs/xfs_acl.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ 




struct inode;

struct inode;

struct posix_acl;

struct posix_acl;

struct xfs_inode;





#ifdef CONFIG_XFS_POSIX_ACL

#ifdef CONFIG_XFS_POSIX_ACL

extern struct posix_acl *xfs_get_acl(struct inode *inode, int type);

extern struct posix_acl *xfs_get_acl(struct inode *inode, int type);

fs/xfs/xfs_log_recover.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3431,7 +3431,7 @@ xlog_recover_add_to_cont_trans( 
	 * previous record. Copy the rest of the header.

	 * previous record. Copy the rest of the header.

	 */

	 */

	if (list_empty(&trans->r_itemq)) {

	if (list_empty(&trans->r_itemq)) {

		ASSERT(len < sizeof(struct xfs_trans_header));

		ASSERT(len <= sizeof(struct xfs_trans_header));

		if (len > sizeof(struct xfs_trans_header)) {

		if (len > sizeof(struct xfs_trans_header)) {

			xfs_warn(log->l_mp, "%s: bad header length", __func__);

			xfs_warn(log->l_mp, "%s: bad header length", __func__);

			return -EIO;

			return -EIO;

fs/xfs/xfs_super.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -838,17 +838,18 @@ xfs_init_mount_workqueues( 
		goto out_destroy_unwritten;

		goto out_destroy_unwritten;





	mp->m_reclaim_workqueue = alloc_workqueue("xfs-reclaim/%s",

	mp->m_reclaim_workqueue = alloc_workqueue("xfs-reclaim/%s",

			WQ_FREEZABLE, 0, mp->m_fsname);

			WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_fsname);

	if (!mp->m_reclaim_workqueue)

	if (!mp->m_reclaim_workqueue)

		goto out_destroy_cil;

		goto out_destroy_cil;





	mp->m_log_workqueue = alloc_workqueue("xfs-log/%s",

	mp->m_log_workqueue = alloc_workqueue("xfs-log/%s",

			WQ_FREEZABLE|WQ_HIGHPRI, 0, mp->m_fsname);

			WQ_MEM_RECLAIM|WQ_FREEZABLE|WQ_HIGHPRI, 0,

			mp->m_fsname);

	if (!mp->m_log_workqueue)

	if (!mp->m_log_workqueue)

		goto out_destroy_reclaim;

		goto out_destroy_reclaim;





	mp->m_eofblocks_workqueue = alloc_workqueue("xfs-eofblocks/%s",

	mp->m_eofblocks_workqueue = alloc_workqueue("xfs-eofblocks/%s",

			WQ_FREEZABLE, 0, mp->m_fsname);

			WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_fsname);

	if (!mp->m_eofblocks_workqueue)

	if (!mp->m_eofblocks_workqueue)

		goto out_destroy_log;

		goto out_destroy_log;