Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'gfs2-v5.16-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Pull gfs2 updates from Andreas Gruenbacher:
"Various minor gfs2 cleanups and fixes"
* tag 'gfs2-v5.16-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
gfs2: dump inode object for iopen glocks
gfs2: Fix gfs2_instantiate description
gfs2: Remove redundant check for GLF_INSTANTIATE_NEEDED
gfs2: remove redundant set of INSTANTIATE_NEEDED
gfs2: Fix __gfs2_holder_init function name in kernel-doc comment
+6
-8
+2
-2
fs/gfs2/glock.c
+2
-2
fs/gfs2/glock.c
···
477
477
478
478
/*
479
479
* gfs2_instantiate - Call the glops instantiate function
480
-
* @gl: The glock
480
+
* @gh: The glock holder
481
481
*
482
482
* Returns: 0 if instantiate was successful, 2 if type specific operation is
483
483
* underway, or error.
···
1245
1245
}
1246
1246
1247
1247
/**
1248
-
* gfs2_holder_init - initialize a struct gfs2_holder in the default way
1248
+
* __gfs2_holder_init - initialize a struct gfs2_holder in the default way
1249
1249
* @gl: the glock
1250
1250
* @state: the state we're requesting
1251
1251
* @flags: the modifier flags
+1
-1
fs/gfs2/glops.c
+1
-1
fs/gfs2/glops.c
···
228
228
gfs2_rgrp_brelse(rgd);
229
229
WARN_ON_ONCE(!(flags & DIO_METADATA));
230
230
truncate_inode_pages_range(mapping, start, end);
231
-
set_bit(GLF_INSTANTIATE_NEEDED, &gl->gl_flags);
232
231
}
233
232
234
233
static void gfs2_rgrp_go_dump(struct seq_file *seq, struct gfs2_glock *gl,
···
763
764
const struct gfs2_glock_operations gfs2_iopen_glops = {
764
765
.go_type = LM_TYPE_IOPEN,
765
766
.go_callback = iopen_go_callback,
767
+
.go_dump = inode_go_dump,
766
768
.go_demote_ok = iopen_go_demote_ok,
767
769
.go_flags = GLOF_LRU | GLOF_NONDISK,
768
770
.go_subclass = 1,
+3
-5
fs/gfs2/super.c
+3
-5
fs/gfs2/super.c
···
1244
1244
if (ret)
1245
1245
return SHOULD_NOT_DELETE_DINODE;
1246
1246
1247
-
if (test_bit(GLF_INSTANTIATE_NEEDED, &ip->i_gl->gl_flags)) {
1248
-
ret = gfs2_instantiate(gh);
1249
-
if (ret)
1250
-
return SHOULD_NOT_DELETE_DINODE;
1251
-
}
1247
+
ret = gfs2_instantiate(gh);
1248
+
if (ret)
1249
+
return SHOULD_NOT_DELETE_DINODE;
1252
1250
1253
1251
/*
1254
1252
* The inode may have been recreated in the meantime.