diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 22:51:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 22:51:18 -0400 |
| commit | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (patch) | |
| tree | 25b8fc041b4dce6c404ff01b462bc6b58fa7d372 /fs/xfs/xfs_alloc.c | |
| parent | 990a8baf568ca1d0ae65e59783ff821794118d07 (diff) | |
| parent | e1a40fa907498030b6e432c0dbcb06d7a9f14ee3 (diff) | |
Merge rsync://oss.sgi.com/git/xfs-2.6
Diffstat (limited to 'fs/xfs/xfs_alloc.c')
| -rw-r--r-- | fs/xfs/xfs_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c index 36603db10fe9..dcfe19703620 100644 --- a/fs/xfs/xfs_alloc.c +++ b/fs/xfs/xfs_alloc.c | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | #define XFSA_FIXUP_BNO_OK 1 | 59 | #define XFSA_FIXUP_BNO_OK 1 |
| 60 | #define XFSA_FIXUP_CNT_OK 2 | 60 | #define XFSA_FIXUP_CNT_OK 2 |
| 61 | 61 | ||
| 62 | int | 62 | STATIC int |
| 63 | xfs_alloc_search_busy(xfs_trans_t *tp, | 63 | xfs_alloc_search_busy(xfs_trans_t *tp, |
| 64 | xfs_agnumber_t agno, | 64 | xfs_agnumber_t agno, |
| 65 | xfs_agblock_t bno, | 65 | xfs_agblock_t bno, |
| @@ -2562,7 +2562,7 @@ xfs_alloc_clear_busy(xfs_trans_t *tp, | |||
| 2562 | /* | 2562 | /* |
| 2563 | * returns non-zero if any of (agno,bno):len is in a busy list | 2563 | * returns non-zero if any of (agno,bno):len is in a busy list |
| 2564 | */ | 2564 | */ |
| 2565 | int | 2565 | STATIC int |
| 2566 | xfs_alloc_search_busy(xfs_trans_t *tp, | 2566 | xfs_alloc_search_busy(xfs_trans_t *tp, |
| 2567 | xfs_agnumber_t agno, | 2567 | xfs_agnumber_t agno, |
| 2568 | xfs_agblock_t bno, | 2568 | xfs_agblock_t bno, |