.. | .. |
---|
4 | 4 | * All Rights Reserved. |
---|
5 | 5 | */ |
---|
6 | 6 | #include "xfs.h" |
---|
| 7 | +#include "xfs_shared.h" |
---|
7 | 8 | #include "xfs_format.h" |
---|
8 | 9 | #include "xfs_log_format.h" |
---|
9 | 10 | #include "xfs_trans_resv.h" |
---|
10 | 11 | #include "xfs_mount.h" |
---|
11 | | -#include "xfs_da_format.h" |
---|
12 | | -#include "xfs_da_btree.h" |
---|
13 | 12 | #include "xfs_dir2.h" |
---|
14 | 13 | #include "xfs_export.h" |
---|
15 | 14 | #include "xfs_inode.h" |
---|
16 | 15 | #include "xfs_trans.h" |
---|
17 | 16 | #include "xfs_inode_item.h" |
---|
18 | | -#include "xfs_trace.h" |
---|
19 | 17 | #include "xfs_icache.h" |
---|
20 | | -#include "xfs_log.h" |
---|
21 | 18 | #include "xfs_pnfs.h" |
---|
22 | 19 | |
---|
23 | 20 | /* |
---|
.. | .. |
---|
59 | 56 | fileid_type = FILEID_INO32_GEN_PARENT; |
---|
60 | 57 | |
---|
61 | 58 | /* |
---|
62 | | - * If the the filesystem may contain 64bit inode numbers, we need |
---|
| 59 | + * If the filesystem may contain 64bit inode numbers, we need |
---|
63 | 60 | * to use larger file handles that can represent them. |
---|
64 | 61 | * |
---|
65 | 62 | * While we only allocate inodes that do not fit into 32 bits any |
---|
.. | .. |
---|
223 | 220 | xfs_fs_nfs_commit_metadata( |
---|
224 | 221 | struct inode *inode) |
---|
225 | 222 | { |
---|
226 | | - struct xfs_inode *ip = XFS_I(inode); |
---|
227 | | - struct xfs_mount *mp = ip->i_mount; |
---|
228 | | - xfs_lsn_t lsn = 0; |
---|
229 | | - |
---|
230 | | - xfs_ilock(ip, XFS_ILOCK_SHARED); |
---|
231 | | - if (xfs_ipincount(ip)) |
---|
232 | | - lsn = ip->i_itemp->ili_last_lsn; |
---|
233 | | - xfs_iunlock(ip, XFS_ILOCK_SHARED); |
---|
234 | | - |
---|
235 | | - if (!lsn) |
---|
236 | | - return 0; |
---|
237 | | - return xfs_log_force_lsn(mp, lsn, XFS_LOG_SYNC, NULL); |
---|
| 223 | + return xfs_log_force_inode(XFS_I(inode)); |
---|
238 | 224 | } |
---|
239 | 225 | |
---|
240 | 226 | const struct export_operations xfs_export_operations = { |
---|