Skip to content

Commit 1392811

Browse files
author
Darrick J. Wong
committed
xfs: move the xfs_rtbitmap.c declarations to xfs_rtbitmap.h
Move all the declarations for functionality in xfs_rtbitmap.c into a separate xfs_rtbitmap.h header file. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de>
1 parent f6a2dae commit 1392811

9 files changed

Lines changed: 89 additions & 78 deletions

File tree

‎fs/xfs/libxfs/xfs_bmap.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "xfs_bmap.h"
2222
#include "xfs_bmap_util.h"
2323
#include "xfs_bmap_btree.h"
24-
#include "xfs_rtalloc.h"
24+
#include "xfs_rtbitmap.h"
2525
#include "xfs_errortag.h"
2626
#include "xfs_error.h"
2727
#include "xfs_quota.h"

‎fs/xfs/libxfs/xfs_rtbitmap.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "xfs_trans.h"
1717
#include "xfs_rtalloc.h"
1818
#include "xfs_error.h"
19+
#include "xfs_rtbitmap.h"
1920

2021
/*
2122
* Realtime allocator bitmap functions shared with userspace.

‎fs/xfs/libxfs/xfs_rtbitmap.h‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
4+
* All Rights Reserved.
5+
*/
6+
#ifndef __XFS_RTBITMAP_H__
7+
#define __XFS_RTBITMAP_H__
8+
9+
/*
10+
* XXX: Most of the realtime allocation functions deal in units of realtime
11+
* extents, not realtime blocks. This looks funny when paired with the type
12+
* name and screams for a larger cleanup.
13+
*/
14+
struct xfs_rtalloc_rec {
15+
xfs_rtblock_t ar_startext;
16+
xfs_rtblock_t ar_extcount;
17+
};
18+
19+
typedef int (*xfs_rtalloc_query_range_fn)(
20+
struct xfs_mount *mp,
21+
struct xfs_trans *tp,
22+
const struct xfs_rtalloc_rec *rec,
23+
void *priv);
24+
25+
#ifdef CONFIG_XFS_RT
26+
int xfs_rtbuf_get(struct xfs_mount *mp, struct xfs_trans *tp,
27+
xfs_rtblock_t block, int issum, struct xfs_buf **bpp);
28+
int xfs_rtcheck_range(struct xfs_mount *mp, struct xfs_trans *tp,
29+
xfs_rtblock_t start, xfs_extlen_t len, int val,
30+
xfs_rtblock_t *new, int *stat);
31+
int xfs_rtfind_back(struct xfs_mount *mp, struct xfs_trans *tp,
32+
xfs_rtblock_t start, xfs_rtblock_t limit,
33+
xfs_rtblock_t *rtblock);
34+
int xfs_rtfind_forw(struct xfs_mount *mp, struct xfs_trans *tp,
35+
xfs_rtblock_t start, xfs_rtblock_t limit,
36+
xfs_rtblock_t *rtblock);
37+
int xfs_rtmodify_range(struct xfs_mount *mp, struct xfs_trans *tp,
38+
xfs_rtblock_t start, xfs_extlen_t len, int val);
39+
int xfs_rtmodify_summary_int(struct xfs_mount *mp, struct xfs_trans *tp,
40+
int log, xfs_rtblock_t bbno, int delta,
41+
struct xfs_buf **rbpp, xfs_fsblock_t *rsb,
42+
xfs_suminfo_t *sum);
43+
int xfs_rtmodify_summary(struct xfs_mount *mp, struct xfs_trans *tp, int log,
44+
xfs_rtblock_t bbno, int delta, struct xfs_buf **rbpp,
45+
xfs_fsblock_t *rsb);
46+
int xfs_rtfree_range(struct xfs_mount *mp, struct xfs_trans *tp,
47+
xfs_rtblock_t start, xfs_extlen_t len,
48+
struct xfs_buf **rbpp, xfs_fsblock_t *rsb);
49+
int xfs_rtalloc_query_range(struct xfs_mount *mp, struct xfs_trans *tp,
50+
const struct xfs_rtalloc_rec *low_rec,
51+
const struct xfs_rtalloc_rec *high_rec,
52+
xfs_rtalloc_query_range_fn fn, void *priv);
53+
int xfs_rtalloc_query_all(struct xfs_mount *mp, struct xfs_trans *tp,
54+
xfs_rtalloc_query_range_fn fn,
55+
void *priv);
56+
bool xfs_verify_rtbno(struct xfs_mount *mp, xfs_rtblock_t rtbno);
57+
int xfs_rtalloc_extent_is_free(struct xfs_mount *mp, struct xfs_trans *tp,
58+
xfs_rtblock_t start, xfs_extlen_t len,
59+
bool *is_free);
60+
/*
61+
* Free an extent in the realtime subvolume. Length is expressed in
62+
* realtime extents, as is the block number.
63+
*/
64+
int /* error */
65+
xfs_rtfree_extent(
66+
struct xfs_trans *tp, /* transaction pointer */
67+
xfs_rtblock_t bno, /* starting block number to free */
68+
xfs_extlen_t len); /* length of extent freed */
69+
70+
/* Same as above, but in units of rt blocks. */
71+
int xfs_rtfree_blocks(struct xfs_trans *tp, xfs_fsblock_t rtbno,
72+
xfs_filblks_t rtlen);
73+
#else /* CONFIG_XFS_RT */
74+
# define xfs_rtfree_extent(t,b,l) (-ENOSYS)
75+
# define xfs_rtfree_blocks(t,rb,rl) (-ENOSYS)
76+
# define xfs_rtalloc_query_range(m,t,l,h,f,p) (-ENOSYS)
77+
# define xfs_rtalloc_query_all(m,t,f,p) (-ENOSYS)
78+
# define xfs_rtbuf_get(m,t,b,i,p) (-ENOSYS)
79+
# define xfs_rtalloc_extent_is_free(m,t,s,l,i) (-ENOSYS)
80+
#endif /* CONFIG_XFS_RT */
81+
82+
#endif /* __XFS_RTBITMAP_H__ */

‎fs/xfs/scrub/fscounters.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "xfs_health.h"
1717
#include "xfs_btree.h"
1818
#include "xfs_ag.h"
19-
#include "xfs_rtalloc.h"
19+
#include "xfs_rtbitmap.h"
2020
#include "xfs_inode.h"
2121
#include "xfs_icache.h"
2222
#include "scrub/scrub.h"

‎fs/xfs/scrub/rtbitmap.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "xfs_mount.h"
1212
#include "xfs_log_format.h"
1313
#include "xfs_trans.h"
14-
#include "xfs_rtalloc.h"
14+
#include "xfs_rtbitmap.h"
1515
#include "xfs_inode.h"
1616
#include "xfs_bmap.h"
1717
#include "scrub/scrub.h"

‎fs/xfs/scrub/rtsummary.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "xfs_inode.h"
1414
#include "xfs_log_format.h"
1515
#include "xfs_trans.h"
16-
#include "xfs_rtalloc.h"
16+
#include "xfs_rtbitmap.h"
1717
#include "xfs_bit.h"
1818
#include "xfs_bmap.h"
1919
#include "scrub/scrub.h"

‎fs/xfs/xfs_fsmap.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "xfs_refcount.h"
2424
#include "xfs_refcount_btree.h"
2525
#include "xfs_alloc_btree.h"
26-
#include "xfs_rtalloc.h"
26+
#include "xfs_rtbitmap.h"
2727
#include "xfs_ag.h"
2828

2929
/* Convert an xfs_fsmap to an fsmap. */

‎fs/xfs/xfs_rtalloc.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "xfs_icache.h"
2020
#include "xfs_rtalloc.h"
2121
#include "xfs_sb.h"
22+
#include "xfs_rtbitmap.h"
2223

2324
/*
2425
* Read and return the summary information for a given extent size,

‎fs/xfs/xfs_rtalloc.h‎

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,6 @@
1111
struct xfs_mount;
1212
struct xfs_trans;
1313

14-
/*
15-
* XXX: Most of the realtime allocation functions deal in units of realtime
16-
* extents, not realtime blocks. This looks funny when paired with the type
17-
* name and screams for a larger cleanup.
18-
*/
19-
struct xfs_rtalloc_rec {
20-
xfs_rtblock_t ar_startext;
21-
xfs_rtblock_t ar_extcount;
22-
};
23-
24-
typedef int (*xfs_rtalloc_query_range_fn)(
25-
struct xfs_mount *mp,
26-
struct xfs_trans *tp,
27-
const struct xfs_rtalloc_rec *rec,
28-
void *priv);
29-
3014
#ifdef CONFIG_XFS_RT
3115
/*
3216
* Function prototypes for exported functions.
@@ -48,19 +32,6 @@ xfs_rtallocate_extent(
4832
xfs_extlen_t prod, /* extent product factor */
4933
xfs_rtblock_t *rtblock); /* out: start block allocated */
5034

51-
/*
52-
* Free an extent in the realtime subvolume. Length is expressed in
53-
* realtime extents, as is the block number.
54-
*/
55-
int /* error */
56-
xfs_rtfree_extent(
57-
struct xfs_trans *tp, /* transaction pointer */
58-
xfs_rtblock_t bno, /* starting block number to free */
59-
xfs_extlen_t len); /* length of extent freed */
60-
61-
/* Same as above, but in units of rt blocks. */
62-
int xfs_rtfree_blocks(struct xfs_trans *tp, xfs_fsblock_t rtbno,
63-
xfs_filblks_t rtlen);
6435

6536
/*
6637
* Initialize realtime fields in the mount structure.
@@ -102,55 +73,11 @@ xfs_growfs_rt(
10273
struct xfs_mount *mp, /* file system mount structure */
10374
xfs_growfs_rt_t *in); /* user supplied growfs struct */
10475

105-
/*
106-
* From xfs_rtbitmap.c
107-
*/
108-
int xfs_rtbuf_get(struct xfs_mount *mp, struct xfs_trans *tp,
109-
xfs_rtblock_t block, int issum, struct xfs_buf **bpp);
110-
int xfs_rtcheck_range(struct xfs_mount *mp, struct xfs_trans *tp,
111-
xfs_rtblock_t start, xfs_extlen_t len, int val,
112-
xfs_rtblock_t *new, int *stat);
113-
int xfs_rtfind_back(struct xfs_mount *mp, struct xfs_trans *tp,
114-
xfs_rtblock_t start, xfs_rtblock_t limit,
115-
xfs_rtblock_t *rtblock);
116-
int xfs_rtfind_forw(struct xfs_mount *mp, struct xfs_trans *tp,
117-
xfs_rtblock_t start, xfs_rtblock_t limit,
118-
xfs_rtblock_t *rtblock);
119-
int xfs_rtmodify_range(struct xfs_mount *mp, struct xfs_trans *tp,
120-
xfs_rtblock_t start, xfs_extlen_t len, int val);
121-
int xfs_rtmodify_summary_int(struct xfs_mount *mp, struct xfs_trans *tp,
122-
int log, xfs_rtblock_t bbno, int delta,
123-
struct xfs_buf **rbpp, xfs_fsblock_t *rsb,
124-
xfs_suminfo_t *sum);
125-
int xfs_rtmodify_summary(struct xfs_mount *mp, struct xfs_trans *tp, int log,
126-
xfs_rtblock_t bbno, int delta, struct xfs_buf **rbpp,
127-
xfs_fsblock_t *rsb);
128-
int xfs_rtfree_range(struct xfs_mount *mp, struct xfs_trans *tp,
129-
xfs_rtblock_t start, xfs_extlen_t len,
130-
struct xfs_buf **rbpp, xfs_fsblock_t *rsb);
131-
int xfs_rtalloc_query_range(struct xfs_mount *mp, struct xfs_trans *tp,
132-
const struct xfs_rtalloc_rec *low_rec,
133-
const struct xfs_rtalloc_rec *high_rec,
134-
xfs_rtalloc_query_range_fn fn, void *priv);
135-
int xfs_rtalloc_query_all(struct xfs_mount *mp, struct xfs_trans *tp,
136-
xfs_rtalloc_query_range_fn fn,
137-
void *priv);
138-
bool xfs_verify_rtbno(struct xfs_mount *mp, xfs_rtblock_t rtbno);
139-
int xfs_rtalloc_extent_is_free(struct xfs_mount *mp, struct xfs_trans *tp,
140-
xfs_rtblock_t start, xfs_extlen_t len,
141-
bool *is_free);
14276
int xfs_rtalloc_reinit_frextents(struct xfs_mount *mp);
14377
#else
14478
# define xfs_rtallocate_extent(t,b,min,max,l,f,p,rb) (-ENOSYS)
145-
# define xfs_rtfree_extent(t,b,l) (-ENOSYS)
146-
# define xfs_rtfree_blocks(t,rb,rl) (-ENOSYS)
14779
# define xfs_rtpick_extent(m,t,l,rb) (-ENOSYS)
14880
# define xfs_growfs_rt(mp,in) (-ENOSYS)
149-
# define xfs_rtalloc_query_range(m,t,l,h,f,p) (-ENOSYS)
150-
# define xfs_rtalloc_query_all(m,t,f,p) (-ENOSYS)
151-
# define xfs_rtbuf_get(m,t,b,i,p) (-ENOSYS)
152-
# define xfs_verify_rtbno(m, r) (false)
153-
# define xfs_rtalloc_extent_is_free(m,t,s,l,i) (-ENOSYS)
15481
# define xfs_rtalloc_reinit_frextents(m) (0)
15582
static inline int /* error */
15683
xfs_rtmount_init(

0 commit comments

Comments
 (0)