diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 18:30:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 18:30:29 -0500 |
| commit | f4d544ee5720d336a8c64f9fd33efb888c302309 (patch) | |
| tree | 3b4674d46b04fbcfc38677df59c92320f65568dd /fs/xfs/xfs_ialloc.c | |
| parent | 0e2f7b837600979d5b6f174a6ff695b85942e985 (diff) | |
| parent | 44a743f68705c681439f264deb05f8f38e9048d3 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: Fix error return for fallocate() on XFS
xfs: cleanup dmapi macros in the umount path
xfs: remove incorrect sparse annotation for xfs_iget_cache_miss
xfs: kill the STATIC_INLINE macro
xfs: uninline xfs_get_extsz_hint
xfs: rename xfs_attr_fetch to xfs_attr_get_int
xfs: simplify xfs_buf_get / xfs_buf_read interfaces
xfs: remove IO_ISAIO
xfs: Wrapped journal record corruption on read at recovery
xfs: cleanup data end I/O handlers
xfs: use WRITE_SYNC_PLUG for synchronous writeout
xfs: reset the i_iolock lock class in the reclaim path
xfs: I/O completion handlers must use NOFS allocations
xfs: fix mmap_sem/iolock inversion in xfs_free_eofblocks
xfs: simplify inode teardown
Diffstat (limited to 'fs/xfs/xfs_ialloc.c')
| -rw-r--r-- | fs/xfs/xfs_ialloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c index 0785797db828..cb907ba69c4c 100644 --- a/fs/xfs/xfs_ialloc.c +++ b/fs/xfs/xfs_ialloc.c | |||
| @@ -425,7 +425,7 @@ xfs_ialloc_ag_alloc( | |||
| 425 | return 0; | 425 | return 0; |
| 426 | } | 426 | } |
| 427 | 427 | ||
| 428 | STATIC_INLINE xfs_agnumber_t | 428 | STATIC xfs_agnumber_t |
| 429 | xfs_ialloc_next_ag( | 429 | xfs_ialloc_next_ag( |
| 430 | xfs_mount_t *mp) | 430 | xfs_mount_t *mp) |
| 431 | { | 431 | { |