Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming
J. Bruce Fields [Thu, 4 Mar 2010 17:03:16 +0000 (12:03 -0500)]
Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.

1  2 
fs/nfsd/vfs.c
fs/xfs/linux-2.6/xfs_export.c

diff --cc fs/nfsd/vfs.c
Simple merge
@@@ -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,