hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/fs/xfs/xfs_buf.h
....@@ -18,14 +18,9 @@
1818 /*
1919 * Base types
2020 */
21
+struct xfs_buf;
2122
2223 #define XFS_BUF_DADDR_NULL ((xfs_daddr_t) (-1LL))
23
-
24
-typedef enum {
25
- XBRW_READ = 1, /* transfer into target memory */
26
- XBRW_WRITE = 2, /* transfer from target memory */
27
- XBRW_ZERO = 3, /* Zero target memory */
28
-} xfs_buf_rw_t;
2924
3025 #define XBF_READ (1 << 0) /* buffer intended for reading from device */
3126 #define XBF_WRITE (1 << 1) /* buffer intended for writing to device */
....@@ -34,22 +29,21 @@
3429 #define XBF_ASYNC (1 << 4) /* initiator will not wait for completion */
3530 #define XBF_DONE (1 << 5) /* all pages in the buffer uptodate */
3631 #define XBF_STALE (1 << 6) /* buffer has been staled, do not find it */
37
-#define XBF_WRITE_FAIL (1 << 24)/* async writes have failed on this buffer */
32
+#define XBF_WRITE_FAIL (1 << 7) /* async writes have failed on this buffer */
3833
39
-/* I/O hints for the BIO layer */
40
-#define XBF_SYNCIO (1 << 10)/* treat this buffer as synchronous I/O */
41
-#define XBF_FUA (1 << 11)/* force cache write through mode */
42
-#define XBF_FLUSH (1 << 12)/* flush the disk cache before a write */
43
-
44
-/* flags used only as arguments to access routines */
45
-#define XBF_TRYLOCK (1 << 16)/* lock requested, but do not wait */
46
-#define XBF_UNMAPPED (1 << 17)/* do not map the buffer */
34
+/* buffer type flags for write callbacks */
35
+#define _XBF_INODES (1 << 16)/* inode buffer */
36
+#define _XBF_DQUOTS (1 << 17)/* dquot buffer */
37
+#define _XBF_LOGRECOVERY (1 << 18)/* log recovery buffer */
4738
4839 /* flags used only internally */
4940 #define _XBF_PAGES (1 << 20)/* backed by refcounted pages */
5041 #define _XBF_KMEM (1 << 21)/* backed by heap memory */
5142 #define _XBF_DELWRI_Q (1 << 22)/* buffer on a delwri queue */
52
-#define _XBF_COMPOUND (1 << 23)/* compound buffer */
43
+
44
+/* flags used only as arguments to access routines */
45
+#define XBF_TRYLOCK (1 << 30)/* lock requested, but do not wait */
46
+#define XBF_UNMAPPED (1 << 31)/* do not map the buffer */
5347
5448 typedef unsigned int xfs_buf_flags_t;
5549
....@@ -62,16 +56,15 @@
6256 { XBF_DONE, "DONE" }, \
6357 { XBF_STALE, "STALE" }, \
6458 { XBF_WRITE_FAIL, "WRITE_FAIL" }, \
65
- { XBF_SYNCIO, "SYNCIO" }, \
66
- { XBF_FUA, "FUA" }, \
67
- { XBF_FLUSH, "FLUSH" }, \
68
- { XBF_TRYLOCK, "TRYLOCK" }, /* should never be set */\
69
- { XBF_UNMAPPED, "UNMAPPED" }, /* ditto */\
59
+ { _XBF_INODES, "INODES" }, \
60
+ { _XBF_DQUOTS, "DQUOTS" }, \
61
+ { _XBF_LOGRECOVERY, "LOG_RECOVERY" }, \
7062 { _XBF_PAGES, "PAGES" }, \
7163 { _XBF_KMEM, "KMEM" }, \
7264 { _XBF_DELWRI_Q, "DELWRI_Q" }, \
73
- { _XBF_COMPOUND, "COMPOUND" }
74
-
65
+ /* The following interface flags should never be set */ \
66
+ { XBF_TRYLOCK, "TRYLOCK" }, \
67
+ { XBF_UNMAPPED, "UNMAPPED" }
7568
7669 /*
7770 * Internal state flags.
....@@ -107,11 +100,8 @@
107100 struct list_lru bt_lru;
108101
109102 struct percpu_counter bt_io_count;
103
+ struct ratelimit_state bt_ioerror_rl;
110104 } xfs_buftarg_t;
111
-
112
-struct xfs_buf;
113
-typedef void (*xfs_buf_iodone_t)(struct xfs_buf *);
114
-
115105
116106 #define XB_PAGES 2
117107
....@@ -125,6 +115,10 @@
125115
126116 struct xfs_buf_ops {
127117 char *name;
118
+ union {
119
+ __be32 magic[2]; /* v4 and v5 on disk magic values */
120
+ __be16 magic16[2]; /* v4 and v5 on disk magic values */
121
+ };
128122 void (*verify_read)(struct xfs_buf *);
129123 void (*verify_write)(struct xfs_buf *);
130124 xfs_failaddr_t (*verify_struct)(struct xfs_buf *bp);
....@@ -157,13 +151,12 @@
157151 wait_queue_head_t b_waiters; /* unpin waiters */
158152 struct list_head b_list;
159153 struct xfs_perag *b_pag; /* contains rbtree root */
154
+ struct xfs_mount *b_mount;
160155 xfs_buftarg_t *b_target; /* buffer target (device) */
161156 void *b_addr; /* virtual address of buffer */
162157 struct work_struct b_ioend_work;
163
- struct workqueue_struct *b_ioend_wq; /* I/O completion wq */
164
- xfs_buf_iodone_t b_iodone; /* I/O completion function */
165158 struct completion b_iowait; /* queue for I/O waiters */
166
- void *b_log_item;
159
+ struct xfs_buf_log_item *b_log_item;
167160 struct list_head b_li_list; /* Log items list head */
168161 struct xfs_trans *b_transp;
169162 struct page **b_pages; /* array of page pointers */
....@@ -171,7 +164,6 @@
171164 struct xfs_buf_map *b_maps; /* compound buffer map */
172165 struct xfs_buf_map __b_map; /* inline compound buffer map */
173166 int b_map_count;
174
- int b_io_length; /* IO size in BBs */
175167 atomic_t b_pin_count; /* pin count */
176168 atomic_t b_io_remaining; /* #outstanding I/O requests */
177169 unsigned int b_page_count; /* size of page array */
....@@ -205,53 +197,40 @@
205197 xfs_daddr_t blkno, size_t numblks,
206198 xfs_buf_flags_t flags);
207199
208
-struct xfs_buf *_xfs_buf_alloc(struct xfs_buftarg *target,
209
- struct xfs_buf_map *map, int nmaps,
210
- xfs_buf_flags_t flags);
211
-
212
-static inline struct xfs_buf *
213
-xfs_buf_alloc(
214
- struct xfs_buftarg *target,
215
- xfs_daddr_t blkno,
216
- size_t numblks,
217
- xfs_buf_flags_t flags)
218
-{
219
- DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);
220
- return _xfs_buf_alloc(target, &map, 1, flags);
221
-}
222
-
223
-struct xfs_buf *xfs_buf_get_map(struct xfs_buftarg *target,
224
- struct xfs_buf_map *map, int nmaps,
225
- xfs_buf_flags_t flags);
226
-struct xfs_buf *xfs_buf_read_map(struct xfs_buftarg *target,
227
- struct xfs_buf_map *map, int nmaps,
228
- xfs_buf_flags_t flags,
229
- const struct xfs_buf_ops *ops);
200
+int xfs_buf_get_map(struct xfs_buftarg *target, struct xfs_buf_map *map,
201
+ int nmaps, xfs_buf_flags_t flags, struct xfs_buf **bpp);
202
+int xfs_buf_read_map(struct xfs_buftarg *target, struct xfs_buf_map *map,
203
+ int nmaps, xfs_buf_flags_t flags, struct xfs_buf **bpp,
204
+ const struct xfs_buf_ops *ops, xfs_failaddr_t fa);
230205 void xfs_buf_readahead_map(struct xfs_buftarg *target,
231206 struct xfs_buf_map *map, int nmaps,
232207 const struct xfs_buf_ops *ops);
233208
234
-static inline struct xfs_buf *
209
+static inline int
235210 xfs_buf_get(
236211 struct xfs_buftarg *target,
237212 xfs_daddr_t blkno,
238213 size_t numblks,
239
- xfs_buf_flags_t flags)
214
+ struct xfs_buf **bpp)
240215 {
241216 DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);
242
- return xfs_buf_get_map(target, &map, 1, flags);
217
+
218
+ return xfs_buf_get_map(target, &map, 1, 0, bpp);
243219 }
244220
245
-static inline struct xfs_buf *
221
+static inline int
246222 xfs_buf_read(
247223 struct xfs_buftarg *target,
248224 xfs_daddr_t blkno,
249225 size_t numblks,
250226 xfs_buf_flags_t flags,
227
+ struct xfs_buf **bpp,
251228 const struct xfs_buf_ops *ops)
252229 {
253230 DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);
254
- return xfs_buf_read_map(target, &map, 1, flags, ops);
231
+
232
+ return xfs_buf_read_map(target, &map, 1, flags, bpp, ops,
233
+ __builtin_return_address(0));
255234 }
256235
257236 static inline void
....@@ -265,18 +244,15 @@
265244 return xfs_buf_readahead_map(target, &map, 1, ops);
266245 }
267246
268
-void xfs_buf_set_empty(struct xfs_buf *bp, size_t numblks);
269
-int xfs_buf_associate_memory(struct xfs_buf *bp, void *mem, size_t length);
270
-
271
-struct xfs_buf *xfs_buf_get_uncached(struct xfs_buftarg *target, size_t numblks,
272
- int flags);
247
+int xfs_buf_get_uncached(struct xfs_buftarg *target, size_t numblks, int flags,
248
+ struct xfs_buf **bpp);
273249 int xfs_buf_read_uncached(struct xfs_buftarg *target, xfs_daddr_t daddr,
274250 size_t numblks, int flags, struct xfs_buf **bpp,
275251 const struct xfs_buf_ops *ops);
252
+int _xfs_buf_read(struct xfs_buf *bp, xfs_buf_flags_t flags);
276253 void xfs_buf_hold(struct xfs_buf *bp);
277254
278255 /* Releasing Buffers */
279
-extern void xfs_buf_free(xfs_buf_t *);
280256 extern void xfs_buf_rele(xfs_buf_t *);
281257
282258 /* Locking and Unlocking Buffers */
....@@ -286,25 +262,23 @@
286262 #define xfs_buf_islocked(bp) \
287263 ((bp)->b_sema.count <= 0)
288264
265
+static inline void xfs_buf_relse(xfs_buf_t *bp)
266
+{
267
+ xfs_buf_unlock(bp);
268
+ xfs_buf_rele(bp);
269
+}
270
+
289271 /* Buffer Read and Write Routines */
290272 extern int xfs_bwrite(struct xfs_buf *bp);
291
-extern void xfs_buf_ioend(struct xfs_buf *bp);
273
+
292274 extern void __xfs_buf_ioerror(struct xfs_buf *bp, int error,
293275 xfs_failaddr_t failaddr);
294276 #define xfs_buf_ioerror(bp, err) __xfs_buf_ioerror((bp), (err), __this_address)
295
-extern void xfs_buf_ioerror_alert(struct xfs_buf *, const char *func);
296
-
297
-extern int __xfs_buf_submit(struct xfs_buf *bp, bool);
298
-static inline int xfs_buf_submit(struct xfs_buf *bp)
299
-{
300
- bool wait = bp->b_flags & XBF_ASYNC ? false : true;
301
- return __xfs_buf_submit(bp, wait);
302
-}
303
-
304
-extern void xfs_buf_iomove(xfs_buf_t *, size_t, size_t, void *,
305
- xfs_buf_rw_t);
306
-#define xfs_buf_zero(bp, off, len) \
307
- xfs_buf_iomove((bp), (off), (len), NULL, XBRW_ZERO)
277
+extern void xfs_buf_ioerror_alert(struct xfs_buf *bp, xfs_failaddr_t fa);
278
+void xfs_buf_ioend_fail(struct xfs_buf *);
279
+void xfs_buf_zero(struct xfs_buf *bp, size_t boff, size_t bsize);
280
+void __xfs_buf_mark_corrupt(struct xfs_buf *bp, xfs_failaddr_t fa);
281
+#define xfs_buf_mark_corrupt(bp) __xfs_buf_mark_corrupt((bp), __this_address)
308282
309283 /* Buffer Utility Routines */
310284 extern void *xfs_buf_offset(struct xfs_buf *, size_t);
....@@ -353,12 +327,6 @@
353327 return atomic_read(&bp->b_pin_count);
354328 }
355329
356
-static inline void xfs_buf_relse(xfs_buf_t *bp)
357
-{
358
- xfs_buf_unlock(bp);
359
- xfs_buf_rele(bp);
360
-}
361
-
362330 static inline int
363331 xfs_buf_verify_cksum(struct xfs_buf *bp, unsigned long cksum_offset)
364332 {
....@@ -385,4 +353,14 @@
385353 #define xfs_getsize_buftarg(buftarg) block_size((buftarg)->bt_bdev)
386354 #define xfs_readonly_buftarg(buftarg) bdev_read_only((buftarg)->bt_bdev)
387355
356
+static inline int
357
+xfs_buftarg_dma_alignment(struct xfs_buftarg *bt)
358
+{
359
+ return queue_dma_alignment(bt->bt_bdev->bd_disk->queue);
360
+}
361
+
362
+int xfs_buf_reverify(struct xfs_buf *bp, const struct xfs_buf_ops *ops);
363
+bool xfs_verify_magic(struct xfs_buf *bp, __be32 dmagic);
364
+bool xfs_verify_magic16(struct xfs_buf *bp, __be16 dmagic);
365
+
388366 #endif /* __XFS_BUF_H__ */