diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-17 12:04:20 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-17 12:04:20 +0200 |
| commit | 8ce44a2174c3b07950d7a8d44774e23e60518205 (patch) | |
| tree | 4bf04cdeed59775462d5326d3bcb00c7343b6163 /fs/xfs/xfs_mount.h | |
| parent | f9a4f063a88297e361fd6676986cf3e39b22de72 (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
Merge tag 'v3.5-rc7' into arm/tegra
This solves the merge conflicts while creating the next
branch.
Linux 3.5-rc7
Conflicts:
drivers/iommu/tegra-smmu.c
Diffstat (limited to 'fs/xfs/xfs_mount.h')
| -rw-r--r-- | fs/xfs/xfs_mount.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index 8b89c5ac72d9..90c1fc9eaea4 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -53,7 +53,7 @@ typedef struct xfs_trans_reservations { #include "xfs_sync.h" -struct log; +struct xlog; struct xfs_mount_args; struct xfs_inode; struct xfs_bmbt_irec; @@ -133,7 +133,7 @@ typedef struct xfs_mount { uint m_readio_blocks; /* min read size blocks */ uint m_writeio_log; /* min write size log bytes */ uint m_writeio_blocks; /* min write size blocks */ - struct log *m_log; /* log specific stuff */ + struct xlog *m_log; /* log specific stuff */ int m_logbufs; /* number of log buffers */ int m_logbsize; /* size of each log buffer */ uint m_rsumlevels; /* rt summary levels */ |