Skip to content

Commit 764a167

Browse files
torvaldstorvalds
committed
Merge tag 'xfs-fixes-7.0-rc2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fixes from Carlos Maiolino: "Nothing reeeally stands out here: a few bug fixes, some refactoring to easily fit the bug fixes, and a couple cosmetic changes" * tag 'xfs-fixes-7.0-rc2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: xfs: add static size checks for ioctl UABI xfs: remove duplicate static size checks xfs: Add comments for usages of some macros. xfs: Update lazy counters in xfs_growfs_rt_bmblock() xfs: Add a comment in xfs_log_sb() xfs: Fix xfs_last_rt_bmblock() xfs: don't report half-built inodes to fserror xfs: don't report metadata inodes to fserror xfs: fix potential pointer access race in xfs_healthmon_get xfs: fix xfs_group release bug in xfs_dax_notify_dev_failure xfs: fix xfs_group release bug in xfs_verify_report_losses xfs: fix copy-paste error in previous fix xfs: Fix error pointer dereference xfs: remove metafile inodes from the active inode stat xfs: cleanup inode counter stats xfs: fix code alignment issues in xfs_ondisk.c xfs: Replace &rtg->rtg_group with rtg_group() xfs: Refactoring the nagcount and delta calculation xfs: Replace ASSERT with XFS_IS_CORRUPT in xfs_rtcopy_summary()
2 parents 3feb464 + 650b774 commit 764a167

22 files changed

Lines changed: 209 additions & 80 deletions

‎fs/xfs/libxfs/xfs_ag.c‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,34 @@ xfs_ag_shrink_space(
872872
return err2;
873873
}
874874

875+
void
876+
xfs_growfs_compute_deltas(
877+
struct xfs_mount *mp,
878+
xfs_rfsblock_t nb,
879+
int64_t *deltap,
880+
xfs_agnumber_t *nagcountp)
881+
{
882+
xfs_rfsblock_t nb_div, nb_mod;
883+
int64_t delta;
884+
xfs_agnumber_t nagcount;
885+
886+
nb_div = nb;
887+
nb_mod = do_div(nb_div, mp->m_sb.sb_agblocks);
888+
if (nb_mod && nb_mod >= XFS_MIN_AG_BLOCKS)
889+
nb_div++;
890+
else if (nb_mod)
891+
nb = nb_div * mp->m_sb.sb_agblocks;
892+
893+
if (nb_div > XFS_MAX_AGNUMBER + 1) {
894+
nb_div = XFS_MAX_AGNUMBER + 1;
895+
nb = nb_div * mp->m_sb.sb_agblocks;
896+
}
897+
nagcount = nb_div;
898+
delta = nb - mp->m_sb.sb_dblocks;
899+
*deltap = delta;
900+
*nagcountp = nagcount;
901+
}
902+
875903
/*
876904
* Extent the AG indicated by the @id by the length passed in
877905
*/

‎fs/xfs/libxfs/xfs_ag.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,9 @@ struct aghdr_init_data {
331331
int xfs_ag_init_headers(struct xfs_mount *mp, struct aghdr_init_data *id);
332332
int xfs_ag_shrink_space(struct xfs_perag *pag, struct xfs_trans **tpp,
333333
xfs_extlen_t delta);
334+
void
335+
xfs_growfs_compute_deltas(struct xfs_mount *mp, xfs_rfsblock_t nb,
336+
int64_t *deltap, xfs_agnumber_t *nagcountp);
334337
int xfs_ag_extend_space(struct xfs_perag *pag, struct xfs_trans *tp,
335338
xfs_extlen_t len);
336339
int xfs_ag_get_geometry(struct xfs_perag *pag, struct xfs_ag_geometry *ageo);

‎fs/xfs/libxfs/xfs_inode_buf.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,10 @@ xfs_inode_from_disk(
268268
}
269269
if (xfs_is_reflink_inode(ip))
270270
xfs_ifork_init_cow(ip);
271+
if (xfs_is_metadir_inode(ip)) {
272+
XFS_STATS_DEC(ip->i_mount, xs_inodes_active);
273+
XFS_STATS_INC(ip->i_mount, xs_inodes_meta);
274+
}
271275
return 0;
272276

273277
out_destroy_data_fork:

‎fs/xfs/libxfs/xfs_metafile.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ xfs_metafile_set_iflag(
6161
ip->i_diflags2 |= XFS_DIFLAG2_METADATA;
6262
ip->i_metatype = metafile_type;
6363
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
64+
65+
XFS_STATS_DEC(ip->i_mount, xs_inodes_active);
66+
XFS_STATS_INC(ip->i_mount, xs_inodes_meta);
6467
}
6568

6669
/* Clear the metadata directory inode flag. */
@@ -74,6 +77,8 @@ xfs_metafile_clear_iflag(
7477

7578
ip->i_diflags2 &= ~XFS_DIFLAG2_METADATA;
7679
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
80+
XFS_STATS_INC(ip->i_mount, xs_inodes_active);
81+
XFS_STATS_DEC(ip->i_mount, xs_inodes_meta);
7782
}
7883

7984
/*

‎fs/xfs/libxfs/xfs_ondisk.h‎

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ xfs_check_ondisk_structs(void)
7373
XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_free_hdr, 64);
7474
XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_leaf, 64);
7575
XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_leaf_hdr, 64);
76-
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_entry, 8);
76+
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_entry, 8);
7777
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_hdr, 32);
7878
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_map, 4);
7979
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_name_local, 4);
@@ -116,7 +116,7 @@ xfs_check_ondisk_structs(void)
116116
XFS_CHECK_STRUCT_SIZE(struct xfs_da_intnode, 16);
117117
XFS_CHECK_STRUCT_SIZE(struct xfs_da_node_entry, 8);
118118
XFS_CHECK_STRUCT_SIZE(struct xfs_da_node_hdr, 16);
119-
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_free, 4);
119+
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_free, 4);
120120
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_hdr, 16);
121121
XFS_CHECK_OFFSET(struct xfs_dir2_data_unused, freetag, 0);
122122
XFS_CHECK_OFFSET(struct xfs_dir2_data_unused, length, 2);
@@ -136,16 +136,7 @@ xfs_check_ondisk_structs(void)
136136
/* ondisk dir/attr structures from xfs/122 */
137137
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_sf_entry, 3);
138138
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_free, 4);
139-
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_hdr, 16);
140139
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_unused, 6);
141-
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_free, 16);
142-
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_free_hdr, 16);
143-
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf, 16);
144-
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_entry, 8);
145-
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_hdr, 16);
146-
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_tail, 4);
147-
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_sf_entry, 3);
148-
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_sf_hdr, 10);
149140

150141
/* log structures */
151142
XFS_CHECK_STRUCT_SIZE(struct xfs_buf_log_format, 88);
@@ -217,11 +208,6 @@ xfs_check_ondisk_structs(void)
217208
XFS_CHECK_OFFSET(struct xfs_dir3_free, hdr.hdr.magic, 0);
218209
XFS_CHECK_OFFSET(struct xfs_attr3_leafblock, hdr.info.hdr, 0);
219210

220-
XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat, 192);
221-
XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers, 24);
222-
XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat_req, 64);
223-
XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers_req, 64);
224-
225211
/*
226212
* Make sure the incore inode timestamp range corresponds to hand
227213
* converted values based on the ondisk format specification.
@@ -301,6 +287,40 @@ xfs_check_ondisk_structs(void)
301287
XFS_CHECK_SB_OFFSET(sb_pad, 281);
302288
XFS_CHECK_SB_OFFSET(sb_rtstart, 288);
303289
XFS_CHECK_SB_OFFSET(sb_rtreserved, 296);
290+
291+
/*
292+
* ioctl UABI
293+
*
294+
* Due to different padding/alignment requirements across
295+
* different architectures, some structures are ommited from
296+
* the size checks. In addition, structures with architecture
297+
* dependent size fields are also ommited (e.g. __kernel_long_t).
298+
*/
299+
XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat, 192);
300+
XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers, 24);
301+
XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat_req, 64);
302+
XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers_req, 64);
303+
XFS_CHECK_STRUCT_SIZE(struct dioattr, 12);
304+
XFS_CHECK_STRUCT_SIZE(struct getbmap, 32);
305+
XFS_CHECK_STRUCT_SIZE(struct getbmapx, 48);
306+
XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist_cursor, 16);
307+
XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist, 8);
308+
XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist, 8);
309+
XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist_ent, 4);
310+
XFS_CHECK_STRUCT_SIZE(struct xfs_ag_geometry, 128);
311+
XFS_CHECK_STRUCT_SIZE(struct xfs_rtgroup_geometry, 128);
312+
XFS_CHECK_STRUCT_SIZE(struct xfs_error_injection, 8);
313+
XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_geom, 256);
314+
XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_geom_v4, 112);
315+
XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_counts, 32);
316+
XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_resblks, 16);
317+
XFS_CHECK_STRUCT_SIZE(struct xfs_growfs_log, 8);
318+
XFS_CHECK_STRUCT_SIZE(struct xfs_bulk_ireq, 64);
319+
XFS_CHECK_STRUCT_SIZE(struct xfs_fs_eofblocks, 128);
320+
XFS_CHECK_STRUCT_SIZE(struct xfs_fsid, 8);
321+
XFS_CHECK_STRUCT_SIZE(struct xfs_scrub_metadata, 64);
322+
XFS_CHECK_STRUCT_SIZE(struct xfs_scrub_vec, 16);
323+
XFS_CHECK_STRUCT_SIZE(struct xfs_scrub_vec_head, 40);
304324
}
305325

306326
#endif /* __XFS_ONDISK_H */

‎fs/xfs/libxfs/xfs_sb.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,6 +1347,9 @@ xfs_log_sb(
13471347
* feature was introduced. This counter can go negative due to the way
13481348
* we handle nearly-lockless reservations, so we must use the _positive
13491349
* variant here to avoid writing out nonsense frextents.
1350+
*
1351+
* RT groups are only supported on v5 file systems, which always
1352+
* have lazy SB counters.
13501353
*/
13511354
if (xfs_has_rtgroups(mp) && !xfs_has_zoned(mp)) {
13521355
mp->m_sb.sb_frextents =

‎fs/xfs/scrub/dir_repair.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ xrep_dir_teardown(
177177
rd->dir_names = NULL;
178178
if (rd->dir_entries)
179179
xfarray_destroy(rd->dir_entries);
180-
rd->dir_names = NULL;
180+
rd->dir_entries = NULL;
181181
}
182182

183183
/* Set up for a directory repair. */

‎fs/xfs/scrub/orphanage.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,11 @@ xrep_adoption_check_dcache(
442442
return 0;
443443

444444
d_child = try_lookup_noperm(&qname, d_orphanage);
445+
if (IS_ERR(d_child)) {
446+
dput(d_orphanage);
447+
return PTR_ERR(d_child);
448+
}
449+
445450
if (d_child) {
446451
trace_xrep_adoption_check_child(sc->mp, d_child);
447452

@@ -479,7 +484,7 @@ xrep_adoption_zap_dcache(
479484
return;
480485

481486
d_child = try_lookup_noperm(&qname, d_orphanage);
482-
while (d_child != NULL) {
487+
while (!IS_ERR_OR_NULL(d_child)) {
483488
trace_xrep_adoption_invalidate_child(sc->mp, d_child);
484489

485490
ASSERT(d_is_negative(d_child));

‎fs/xfs/xfs_fsops.c‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,17 @@ xfs_growfs_data_private(
9595
struct xfs_growfs_data *in) /* growfs data input struct */
9696
{
9797
xfs_agnumber_t oagcount = mp->m_sb.sb_agcount;
98+
xfs_rfsblock_t nb = in->newblocks;
9899
struct xfs_buf *bp;
99100
int error;
100101
xfs_agnumber_t nagcount;
101102
xfs_agnumber_t nagimax = 0;
102-
xfs_rfsblock_t nb, nb_div, nb_mod;
103103
int64_t delta;
104104
bool lastag_extended = false;
105105
struct xfs_trans *tp;
106106
struct aghdr_init_data id = {};
107107
struct xfs_perag *last_pag;
108108

109-
nb = in->newblocks;
110109
error = xfs_sb_validate_fsb_count(&mp->m_sb, nb);
111110
if (error)
112111
return error;
@@ -125,20 +124,8 @@ xfs_growfs_data_private(
125124
mp->m_sb.sb_rextsize);
126125
if (error)
127126
return error;
127+
xfs_growfs_compute_deltas(mp, nb, &delta, &nagcount);
128128

129-
nb_div = nb;
130-
nb_mod = do_div(nb_div, mp->m_sb.sb_agblocks);
131-
if (nb_mod && nb_mod >= XFS_MIN_AG_BLOCKS)
132-
nb_div++;
133-
else if (nb_mod)
134-
nb = nb_div * mp->m_sb.sb_agblocks;
135-
136-
if (nb_div > XFS_MAX_AGNUMBER + 1) {
137-
nb_div = XFS_MAX_AGNUMBER + 1;
138-
nb = nb_div * mp->m_sb.sb_agblocks;
139-
}
140-
nagcount = nb_div;
141-
delta = nb - mp->m_sb.sb_dblocks;
142129
/*
143130
* Reject filesystems with a single AG because they are not
144131
* supported, and reject a shrink operation that would cause a

‎fs/xfs/xfs_health.c‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,22 @@ xfs_rgno_mark_sick(
314314
xfs_rtgroup_put(rtg);
315315
}
316316

317+
static inline void xfs_inode_report_fserror(struct xfs_inode *ip)
318+
{
319+
/*
320+
* Do not report inodes being constructed or freed, or metadata inodes,
321+
* to fsnotify.
322+
*/
323+
if (xfs_iflags_test(ip, XFS_INEW | XFS_IRECLAIM) ||
324+
xfs_is_internal_inode(ip)) {
325+
fserror_report_metadata(ip->i_mount->m_super, -EFSCORRUPTED,
326+
GFP_NOFS);
327+
return;
328+
}
329+
330+
fserror_report_file_metadata(VFS_I(ip), -EFSCORRUPTED, GFP_NOFS);
331+
}
332+
317333
/* Mark the unhealthy parts of an inode. */
318334
void
319335
xfs_inode_mark_sick(
@@ -339,7 +355,7 @@ xfs_inode_mark_sick(
339355
inode_state_clear(VFS_I(ip), I_DONTCACHE);
340356
spin_unlock(&VFS_I(ip)->i_lock);
341357

342-
fserror_report_file_metadata(VFS_I(ip), -EFSCORRUPTED, GFP_NOFS);
358+
xfs_inode_report_fserror(ip);
343359
if (mask)
344360
xfs_healthmon_report_inode(ip, XFS_HEALTHMON_SICK, old_mask,
345361
mask);
@@ -371,7 +387,7 @@ xfs_inode_mark_corrupt(
371387
inode_state_clear(VFS_I(ip), I_DONTCACHE);
372388
spin_unlock(&VFS_I(ip)->i_lock);
373389

374-
fserror_report_file_metadata(VFS_I(ip), -EFSCORRUPTED, GFP_NOFS);
390+
xfs_inode_report_fserror(ip);
375391
if (mask)
376392
xfs_healthmon_report_inode(ip, XFS_HEALTHMON_CORRUPT, old_mask,
377393
mask);

0 commit comments

Comments
 (0)