diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 12:12:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 12:12:43 -0500 |
| commit | d180ec5d348e3a51836d723c182374483012c981 (patch) | |
| tree | 252bcf36f7f6e329d94092a3238a79d7f2e1e2e2 /fs/xfs/xfs_log_recover.c | |
| parent | 53365383c4667aba55385cd1858582c19a7a8a36 (diff) | |
| parent | 0b1b213fcf3a8486ada99a2bab84ab8c6f51b264 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: event tracing support
xfs: change the xfs_iext_insert / xfs_iext_remove
xfs: cleanup bmap extent state macros
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 9d4fdcaf897..69ac2e5ef20 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include "xfs_quota.h" | 46 | #include "xfs_quota.h" |
| 47 | #include "xfs_rw.h" | 47 | #include "xfs_rw.h" |
| 48 | #include "xfs_utils.h" | 48 | #include "xfs_utils.h" |
| 49 | #include "xfs_trace.h" | ||
| 49 | 50 | ||
| 50 | STATIC int xlog_find_zeroed(xlog_t *, xfs_daddr_t *); | 51 | STATIC int xlog_find_zeroed(xlog_t *, xfs_daddr_t *); |
| 51 | STATIC int xlog_clear_stale_blocks(xlog_t *, xfs_lsn_t); | 52 | STATIC int xlog_clear_stale_blocks(xlog_t *, xfs_lsn_t); |