Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs (8aa4349a) · Commits · e / devices / android_kernel_fairphone_FP5

fs/xfs/xfs_dfrag.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,12 @@ xfs_swapext(
		goto out_put_target_file;
		}

		if (IS_SWAPFILE(file->f_path.dentry->d_inode) \|\|
		IS_SWAPFILE(target_file->f_path.dentry->d_inode)) {
		error = XFS_ERROR(EINVAL);
		goto out_put_target_file;
		}

		ip = XFS_I(file->f_path.dentry->d_inode);
		tip = XFS_I(target_file->f_path.dentry->d_inode);

+8 −6

Original line number	Diff line number	Diff line
		@@ -574,7 +574,7 @@ xfs_log_mount(
		error = xfs_trans_ail_init(mp);
		if (error) {
		cmn_err(CE_WARN, "XFS: AIL initialisation failed: error %d", error);
		goto error;
		goto out_free_log;
		}
		mp->m_log->l_ailp = mp->m_ail;

		@@ -594,20 +594,22 @@ xfs_log_mount(
		mp->m_flags \|= XFS_MOUNT_RDONLY;
		if (error) {
		cmn_err(CE_WARN, "XFS: log mount/recovery failed: error %d", error);
		goto error;
		goto out_destroy_ail;
		}
		}

		/* Normal transactions can now occur */
		mp->m_log->l_flags &= ~XLOG_ACTIVE_RECOVERY;

		/* End mounting message in xfs_log_mount_finish */
		return 0;
		error:
		xfs_log_unmount_dealloc(mp);

		out_destroy_ail:
		xfs_trans_ail_destroy(mp);
		out_free_log:
		xlog_dealloc_log(mp->m_log);
		out:
		return error;
		} /* xfs_log_mount */
		}

		/*
		* Finish the recovery of the file system. This is separate from