aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_discard.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/xfs_discard.c')
-rw-r--r--fs/xfs/xfs_discard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
index 1ad3a4b8ca4..f9c3fe304a1 100644
--- a/fs/xfs/xfs_discard.c
+++ b/fs/xfs/xfs_discard.c
@@ -17,7 +17,6 @@
17 */ 17 */
18#include "xfs.h" 18#include "xfs.h"
19#include "xfs_sb.h" 19#include "xfs_sb.h"
20#include "xfs_inum.h"
21#include "xfs_log.h" 20#include "xfs_log.h"
22#include "xfs_ag.h" 21#include "xfs_ag.h"
23#include "xfs_mount.h" 22#include "xfs_mount.h"
@@ -30,6 +29,7 @@
30#include "xfs_inode.h" 29#include "xfs_inode.h"
31#include "xfs_alloc.h" 30#include "xfs_alloc.h"
32#include "xfs_error.h" 31#include "xfs_error.h"
32#include "xfs_extent_busy.h"
33#include "xfs_discard.h" 33#include "xfs_discard.h"
34#include "xfs_trace.h" 34#include "xfs_trace.h"
35 35
@@ -118,7 +118,7 @@ xfs_trim_extents(
118 * If any blocks in the range are still busy, skip the 118 * If any blocks in the range are still busy, skip the
119 * discard and try again the next time. 119 * discard and try again the next time.
120 */ 120 */
121 if (xfs_alloc_busy_search(mp, agno, fbno, flen)) { 121 if (xfs_extent_busy_search(mp, agno, fbno, flen)) {
122 trace_xfs_discard_busy(mp, agno, fbno, flen); 122 trace_xfs_discard_busy(mp, agno, fbno, flen);
123 goto next_extent; 123 goto next_extent;
124 } 124 }
@@ -212,7 +212,7 @@ xfs_discard_extents(
212 struct xfs_mount *mp, 212 struct xfs_mount *mp,
213 struct list_head *list) 213 struct list_head *list)
214{ 214{
215 struct xfs_busy_extent *busyp; 215 struct xfs_extent_busy *busyp;
216 int error = 0; 216 int error = 0;
217 217
218 list_for_each_entry(busyp, list, list) { 218 list_for_each_entry(busyp, list, list) {