lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[GFS2] lockdump improvements

Browse Source 
The patch below consists of the following changes (in code order):

1. I fixed a minor compiler warning regarding the printing of
   a kernel symbol address.
2. I implemented a suggestion from Dave Teigland that moves
   the debugfs information for gfs2 into a subdirectory so
   we can easily expand our use of debugfs in the future.
   The current code keeps the glock information in:
   /debug/gfs2/<fs>
   With the patch, the new code keeps the glock information in:
   /debug/gfs2/<fs>/glock
   That will allow us to create more debugfs files in the future.
3. This fixes a bug whereby a failed mount attempt causes the
   debugfs file to not be deleted.  Failed mount attempts should
   always clean up after themselves, including deleting the
   debugfs file and/or directory.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Robert Peterson
2007-04-18 11:41:11 -05:00
committed by Steven Whitehouse
parent bdd19a22f8
commit 5f8820960c
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fs/gfs2/glock.c
View File

@@ -1774,7 +1774,7 @@ static void gfs2_print_symbol(struct glock_iter *gi, const char *fmt,
if (gi) { if (gi) {
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
sprintf(buffer, "%p", address); sprintf(buffer, "0x%08lx", address);
print_dbg(gi, fmt, buffer); print_dbg(gi, fmt, buffer);
} }
else else
@@ -2146,11 +2146,14 @@ static const struct file_operations gfs2_debug_fops = {
int gfs2_create_debugfs_file(struct gfs2_sbd *sdp) int gfs2_create_debugfs_file(struct gfs2_sbd *sdp)
{ {
sdp->debugfs_dentry = debugfs_create_file(sdp->sd_table_name, sdp->debugfs_dir = debugfs_create_dir(sdp->sd_table_name, gfs2_root);
S_IFREG | S_IRUGO, if (!sdp->debugfs_dir)
gfs2_root, sdp, return -ENOMEM;
&gfs2_debug_fops); sdp->debugfs_dentry_glocks = debugfs_create_file("glocks",
if (!sdp->debugfs_dentry) S_IFREG | S_IRUGO,
sdp->debugfs_dir, sdp,
&gfs2_debug_fops);
if (!sdp->debugfs_dentry_glocks)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
@@ -2158,8 +2161,14 @@ int gfs2_create_debugfs_file(struct gfs2_sbd *sdp)
void gfs2_delete_debugfs_file(struct gfs2_sbd *sdp) void gfs2_delete_debugfs_file(struct gfs2_sbd *sdp)
{ {
if (sdp && sdp->debugfs_dentry) if (sdp && sdp->debugfs_dir) {
debugfs_remove(sdp->debugfs_dentry); if (sdp->debugfs_dentry_glocks) {
debugfs_remove(sdp->debugfs_dentry_glocks);
sdp->debugfs_dentry_glocks = NULL;
}
debugfs_remove(sdp->debugfs_dir);
sdp->debugfs_dir = NULL;
}
} }
int gfs2_register_debugfs(void) int gfs2_register_debugfs(void)
@@ -2171,4 +2180,5 @@ int gfs2_register_debugfs(void)
void gfs2_unregister_debugfs(void) void gfs2_unregister_debugfs(void)
{ {
debugfs_remove(gfs2_root); debugfs_remove(gfs2_root);
gfs2_root = NULL;
} }

3
fs/gfs2/incore.h
View File

@@ -609,7 +609,8 @@ struct gfs2_sbd {
unsigned long sd_last_warning; unsigned long sd_last_warning;
struct vfsmount *sd_gfs2mnt; struct vfsmount *sd_gfs2mnt;
struct dentry *debugfs_dentry; /* for debugfs */ struct dentry *debugfs_dir; /* debugfs directory */
struct dentry *debugfs_dentry_glocks; /* for debugfs */
}; };
#endif /* __INCORE_DOT_H__ */ #endif /* __INCORE_DOT_H__ */

1
fs/gfs2/ops_fstype.c
View File

@@ -756,6 +756,7 @@ fail_lm:
fail_sys: fail_sys:
gfs2_sys_fs_del(sdp); gfs2_sys_fs_del(sdp);
fail: fail:
gfs2_delete_debugfs_file(sdp);
kfree(sdp); kfree(sdp);
sb->s_fs_info = NULL; sb->s_fs_info = NULL;
return error; return error;