diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-01-22 01:20:53 +0300 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-01-22 01:20:53 +0300 |
| commit | 465e2def7cb45864da1f82afb973a6acd1046ed8 (patch) | |
| tree | d085a45f4575a8ea31d128626c4f1f650cf9d54a /fs/xfs/libxfs/xfs_sb.h | |
| parent | 6bcf0939ff12464c7ea24c056826b8a26def9b06 (diff) | |
| parent | 074e427ba7f7398427e4f8e2aec071edcc509673 (diff) | |
| download | linux-465e2def7cb45864da1f82afb973a6acd1046ed8.tar.xz | |
Merge branch 'xfs-sb-logging-rework' into for-next
Conflicts:
fs/xfs/xfs_mount.c
Diffstat (limited to 'fs/xfs/libxfs/xfs_sb.h')
| -rw-r--r-- | fs/xfs/libxfs/xfs_sb.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/xfs/libxfs/xfs_sb.h b/fs/xfs/libxfs/xfs_sb.h index 8eb1c54bafbf..b25bb9a343f3 100644 --- a/fs/xfs/libxfs/xfs_sb.h +++ b/fs/xfs/libxfs/xfs_sb.h @@ -27,11 +27,12 @@ extern struct xfs_perag *xfs_perag_get_tag(struct xfs_mount *, xfs_agnumber_t, extern void xfs_perag_put(struct xfs_perag *pag); extern int xfs_initialize_perag_data(struct xfs_mount *, xfs_agnumber_t); -extern void xfs_sb_calc_crc(struct xfs_buf *); -extern void xfs_mod_sb(struct xfs_trans *, __int64_t); -extern void xfs_sb_mount_common(struct xfs_mount *, struct xfs_sb *); -extern void xfs_sb_from_disk(struct xfs_sb *, struct xfs_dsb *); -extern void xfs_sb_to_disk(struct xfs_dsb *, struct xfs_sb *, __int64_t); +extern void xfs_sb_calc_crc(struct xfs_buf *bp); +extern void xfs_log_sb(struct xfs_trans *tp); +extern int xfs_sync_sb(struct xfs_mount *mp, bool wait); +extern void xfs_sb_mount_common(struct xfs_mount *mp, struct xfs_sb *sbp); +extern void xfs_sb_from_disk(struct xfs_sb *to, struct xfs_dsb *from); +extern void xfs_sb_to_disk(struct xfs_dsb *to, struct xfs_sb *from); extern void xfs_sb_quota_from_disk(struct xfs_sb *sbp); #endif /* __XFS_SB_H__ */ |