gfs: Get rid of unnucessary locking in inode_go_dump
Commit 27a2660f1e
("gfs2: Dump nrpages for inodes and their glocks")
added some locking around reading inode->i_data.nrpages. That locking
doesn't do anything really, so get rid of it.
With that, the glock argument to ->go_dump() can be made const again as
well.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
This commit is contained in:
parent
6c7410f449
commit
f246dd4b78
@ -236,7 +236,7 @@ static void rgrp_go_inval(struct gfs2_glock *gl, int flags)
|
||||
truncate_inode_pages_range(mapping, start, end);
|
||||
}
|
||||
|
||||
static void gfs2_rgrp_go_dump(struct seq_file *seq, struct gfs2_glock *gl,
|
||||
static void gfs2_rgrp_go_dump(struct seq_file *seq, const struct gfs2_glock *gl,
|
||||
const char *fs_id_buf)
|
||||
{
|
||||
struct gfs2_rgrpd *rgd = gl->gl_object;
|
||||
@ -536,28 +536,23 @@ static int inode_go_held(struct gfs2_holder *gh)
|
||||
*
|
||||
*/
|
||||
|
||||
static void inode_go_dump(struct seq_file *seq, struct gfs2_glock *gl,
|
||||
static void inode_go_dump(struct seq_file *seq, const struct gfs2_glock *gl,
|
||||
const char *fs_id_buf)
|
||||
{
|
||||
struct gfs2_inode *ip = gl->gl_object;
|
||||
struct inode *inode;
|
||||
unsigned long nrpages;
|
||||
const struct inode *inode = &ip->i_inode;
|
||||
|
||||
if (ip == NULL)
|
||||
return;
|
||||
|
||||
inode = &ip->i_inode;
|
||||
xa_lock_irq(&inode->i_data.i_pages);
|
||||
nrpages = inode->i_data.nrpages;
|
||||
xa_unlock_irq(&inode->i_data.i_pages);
|
||||
|
||||
gfs2_print_dbg(seq, "%s I: n:%llu/%llu t:%u f:0x%02lx d:0x%08x s:%llu "
|
||||
"p:%lu\n", fs_id_buf,
|
||||
(unsigned long long)ip->i_no_formal_ino,
|
||||
(unsigned long long)ip->i_no_addr,
|
||||
IF2DT(ip->i_inode.i_mode), ip->i_flags,
|
||||
IF2DT(inode->i_mode), ip->i_flags,
|
||||
(unsigned int)ip->i_diskflags,
|
||||
(unsigned long long)i_size_read(inode), nrpages);
|
||||
(unsigned long long)i_size_read(inode),
|
||||
inode->i_data.nrpages);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -221,7 +221,7 @@ struct gfs2_glock_operations {
|
||||
int (*go_demote_ok) (const struct gfs2_glock *gl);
|
||||
int (*go_instantiate) (struct gfs2_glock *gl);
|
||||
int (*go_held)(struct gfs2_holder *gh);
|
||||
void (*go_dump)(struct seq_file *seq, struct gfs2_glock *gl,
|
||||
void (*go_dump)(struct seq_file *seq, const struct gfs2_glock *gl,
|
||||
const char *fs_id_buf);
|
||||
void (*go_callback)(struct gfs2_glock *gl, bool remote);
|
||||
void (*go_free)(struct gfs2_glock *gl);
|
||||
|
Loading…
Reference in New Issue
Block a user