diff options
author | Chandra Seetharaman <sekharan@us.ibm.com> | 2012-01-23 12:31:37 -0500 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2012-02-03 12:21:33 -0500 |
commit | 6bd92a239fc71ea26eb1dab3aece5eaaa99d4ef7 (patch) | |
tree | 675da1fb11cb8e36edbfb098ac07c0861f6b51f2 /fs/xfs/xfs_mount.c | |
parent | 36731410834e08c7d15c3980abd6cc4c563c2e87 (diff) |
Change xfs_sb_from_disk() interface to take a mount pointer
Change xfs_sb_from_disk() interface to take a mount pointer
instead of a superblock pointer.
This is to print mount point specific error messages in future
fixes.
Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_mount.c')
-rw-r--r-- | fs/xfs/xfs_mount.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index e07f8528c5ef..1ffead4b2296 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -553,9 +553,11 @@ out_unwind: | |||
553 | 553 | ||
554 | void | 554 | void |
555 | xfs_sb_from_disk( | 555 | xfs_sb_from_disk( |
556 | xfs_sb_t *to, | 556 | struct xfs_mount *mp, |
557 | xfs_dsb_t *from) | 557 | xfs_dsb_t *from) |
558 | { | 558 | { |
559 | struct xfs_sb *to = &mp->m_sb; | ||
560 | |||
559 | to->sb_magicnum = be32_to_cpu(from->sb_magicnum); | 561 | to->sb_magicnum = be32_to_cpu(from->sb_magicnum); |
560 | to->sb_blocksize = be32_to_cpu(from->sb_blocksize); | 562 | to->sb_blocksize = be32_to_cpu(from->sb_blocksize); |
561 | to->sb_dblocks = be64_to_cpu(from->sb_dblocks); | 563 | to->sb_dblocks = be64_to_cpu(from->sb_dblocks); |
@@ -693,7 +695,7 @@ reread: | |||
693 | * Initialize the mount structure from the superblock. | 695 | * Initialize the mount structure from the superblock. |
694 | * But first do some basic consistency checking. | 696 | * But first do some basic consistency checking. |
695 | */ | 697 | */ |
696 | xfs_sb_from_disk(&mp->m_sb, XFS_BUF_TO_SBP(bp)); | 698 | xfs_sb_from_disk(mp, XFS_BUF_TO_SBP(bp)); |
697 | error = xfs_mount_validate_sb(mp, &(mp->m_sb), flags); | 699 | error = xfs_mount_validate_sb(mp, &(mp->m_sb), flags); |
698 | if (error) { | 700 | if (error) { |
699 | if (loud) | 701 | if (loud) |