From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Thu, 4 Mar 2010 17:03:16 +0000 (-0500)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming
X-Git-Tag: accepted/tizen/common/20141203.182822~11158^2~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ea41e2de5bba756858bb40f964e3490b6d1a25c;p=platform%2Fkernel%2Flinux-arm64.git

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

Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.
---

4ea41e2de5bba756858bb40f964e3490b6d1a25c
diff --cc fs/xfs/linux-2.6/xfs_export.c
index 8f4d707,87b8cbd..846b75a
--- a/fs/xfs/linux-2.6/xfs_export.c
+++ b/fs/xfs/linux-2.6/xfs_export.c
@@@ -216,24 -215,6 +216,24 @@@ xfs_fs_get_parent
  	return d_obtain_alias(VFS_I(cip));
  }
  
 +STATIC int
 +xfs_fs_nfs_commit_metadata(
 +	struct inode		*inode)
 +{
 +	struct xfs_inode	*ip = XFS_I(inode);
 +	struct xfs_mount	*mp = ip->i_mount;
 +	int			error = 0;
 +
 +	xfs_ilock(ip, XFS_ILOCK_SHARED);
 +	if (xfs_ipincount(ip)) {
- 		error = _xfs_log_force(mp, ip->i_itemp->ili_last_lsn,
- 				XFS_LOG_FORCE | XFS_LOG_SYNC, NULL);
++		error = _xfs_log_force_lsn(mp, ip->i_itemp->ili_last_lsn,
++				XFS_LOG_SYNC, NULL);
 +	}
 +	xfs_iunlock(ip, XFS_ILOCK_SHARED);
 +
 +	return error;
 +}
 +
  const struct export_operations xfs_export_operations = {
  	.encode_fh		= xfs_fs_encode_fh,
  	.fh_to_dentry		= xfs_fs_fh_to_dentry,