mv643xx_eth: Fix compile error for architectures without clk.

[pandora-kernel.git] / fs / xfs / xfs_discard.c

diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
index 1ad3a4b..f9c3fe3 100644 (file)
--- a/fs/xfs/xfs_discard.c
+++ b/fs/xfs/xfs_discard.c
@@ -17,7 +17,6 @@
  */
 #include "xfs.h"
 #include "xfs_sb.h"
-#include "xfs_inum.h"
 #include "xfs_log.h"
 #include "xfs_ag.h"
 #include "xfs_mount.h"
@@ -30,6 +29,7 @@
 #include "xfs_inode.h"
 #include "xfs_alloc.h"
 #include "xfs_error.h"
+#include "xfs_extent_busy.h"
 #include "xfs_discard.h"
 #include "xfs_trace.h"
 
@@ -118,7 +118,7 @@ xfs_trim_extents(
                 * If any blocks in the range are still busy, skip the
                 * discard and try again the next time.
                 */
-               if (xfs_alloc_busy_search(mp, agno, fbno, flen)) {
+               if (xfs_extent_busy_search(mp, agno, fbno, flen)) {
                        trace_xfs_discard_busy(mp, agno, fbno, flen);
                        goto next_extent;
                }
@@ -212,7 +212,7 @@ xfs_discard_extents(
        struct xfs_mount        *mp,
        struct list_head        *list)
 {
-       struct xfs_busy_extent  *busyp;
+       struct xfs_extent_busy  *busyp;
        int                     error = 0;
 
        list_for_each_entry(busyp, list, list) {