diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-23 13:21:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-23 13:21:24 -0700 |
| commit | ca42b7bebcca5bc64e9fc3c7b9332fec242fc801 (patch) | |
| tree | ea458b81bb4de81c7daf9f0c2c5a6192ab34bdd7 | |
| parent | 41f178b77b48a902eec2f5ffefcc2db4c287626b (diff) | |
| download | patches-ca42b7bebcca5bc64e9fc3c7b9332fec242fc801.tar.gz | |
f2fs updates
| -rw-r--r-- | f2fs-gc.h-make-should_do_checkpoint-inline.patch | 6 | ||||
| -rw-r--r-- | f2fs-make-the-debugging-files-work-only-for-the-requested-superblock.patch | 66 | ||||
| -rw-r--r-- | f2fs-move-proc-files-to-debugfs.patch | 14 | ||||
| -rw-r--r-- | f2fs-move-statistics-code-into-one-file.patch | 7 | ||||
| -rw-r--r-- | series | 1 |
5 files changed, 83 insertions, 11 deletions
diff --git a/f2fs-gc.h-make-should_do_checkpoint-inline.patch b/f2fs-gc.h-make-should_do_checkpoint-inline.patch index 20c4278ce5b4b8..6f167180fded8f 100644 --- a/f2fs-gc.h-make-should_do_checkpoint-inline.patch +++ b/f2fs-gc.h-make-should_do_checkpoint-inline.patch @@ -4,8 +4,10 @@ To: Greg KH <gregkh@linuxfoundation.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Subject: f2fs: gc.h: make should_do_checkpoint() inline -This should be an inline function, not a "real" function. Now other files can -properly include gc.h. +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +This should be an inline function, not a "real" function. Now other +files can properly include gc.h. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> diff --git a/f2fs-make-the-debugging-files-work-only-for-the-requested-superblock.patch b/f2fs-make-the-debugging-files-work-only-for-the-requested-superblock.patch new file mode 100644 index 00000000000000..d5b8129c2be912 --- /dev/null +++ b/f2fs-make-the-debugging-files-work-only-for-the-requested-superblock.patch @@ -0,0 +1,66 @@ +Subject: f2fs: make the debugging files work only for the requested superblock + +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +Right now, each debug file shows the information for all superblocks, +not just the one being referenced. This patch fixes that. + + +--- + fs/f2fs/debug.c | 24 ++++++------------------ + 1 file changed, 6 insertions(+), 18 deletions(-) + +--- a/fs/f2fs/debug.c ++++ b/fs/f2fs/debug.c +@@ -270,20 +270,10 @@ static const struct file_operations sit_ + + static int mem_show(struct seq_file *s, void *v) + { +- struct f2fs_gc_info *gc_i, *next; +- struct f2fs_stat_info *si; ++ struct f2fs_sb_info *sbi = v; ++ unsigned npages; ++ unsigned base_mem = 0, cache_mem = 0; + +- list_for_each_entry_safe(gc_i, next, &f2fs_stat_list, stat_list) { +- struct f2fs_sb_info *sbi = gc_i->stat_info->sbi; +- unsigned npages; +- unsigned base_mem = 0, cache_mem = 0; +- +- si = gc_i->stat_info; +- mutex_lock(&si->stat_list); +- if (!si->sbi) { +- mutex_unlock(&si->stat_list); +- continue; +- } + base_mem += sizeof(struct f2fs_sb_info) + sbi->sb->s_blocksize; + base_mem += 2 * sizeof(struct f2fs_inode_info); + base_mem += sizeof(*sbi->ckpt); +@@ -336,8 +326,6 @@ static int mem_show(struct seq_file *s, + seq_printf(s, "%u KB = static: %u + cached: %u\n", + (base_mem + cache_mem) >> 10, + base_mem >> 10, cache_mem >> 10); +- mutex_unlock(&si->stat_list); +- } + return 0; + } + +@@ -407,15 +395,15 @@ int f2fs_stat_init(struct super_block *s + return -EINVAL; + + if (!debugfs_create_file("f2fs_stat", S_IRUGO, sbi->s_debug, +- NULL, &stat_fops)) ++ sbi, &stat_fops)) + goto failed; + + if (!debugfs_create_file("f2fs_sit_stat", S_IRUGO, sbi->s_debug, +- NULL, &sit_fops)) ++ sbi, &sit_fops)) + goto failed; + + if (!debugfs_create_file("f2fs_mem_stat", S_IRUGO, sbi->s_debug, +- NULL, &mem_fops)) ++ sbi, &mem_fops)) + goto failed; + + return 0; diff --git a/f2fs-move-proc-files-to-debugfs.patch b/f2fs-move-proc-files-to-debugfs.patch index 1f17bda58a9b32..9353b200599b1f 100644 --- a/f2fs-move-proc-files-to-debugfs.patch +++ b/f2fs-move-proc-files-to-debugfs.patch @@ -4,15 +4,15 @@ To: Greg KH <gregkh@linuxfoundation.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Subject: f2fs: move proc files to debugfs -This moves all of the f2fs debugging files into debugfs. The files are located -in /sys/kernel/debug/f2fs/ +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Note, I think we are generating all of the same information in each of the -files for every unique f2fs filesystem in the machine. This copies the -functionality that was present in the proc files, but this should be fixed up -in the future. +This moves all of the f2fs debugging files into debugfs. The files are +located in /sys/kernel/debug/f2fs/ -Compile-tested only, I don't have any f2fs images here to run-time test this with. +Note, we are generating all of the same information in each of the files +for every unique f2fs filesystem in the machine. This copies the +functionality that was present in the proc files, but this should be +fixed up in the future. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- diff --git a/f2fs-move-statistics-code-into-one-file.patch b/f2fs-move-statistics-code-into-one-file.patch index 3540d3728f25c3..397e12456df31d 100644 --- a/f2fs-move-statistics-code-into-one-file.patch +++ b/f2fs-move-statistics-code-into-one-file.patch @@ -4,8 +4,11 @@ To: Greg KH <gregkh@linuxfoundation.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Subject: f2fs: move statistics code into one file -This moves all of the procfs statistics code into one file, debug.c and removes -the #ifdefs from the core f2fs code when calling statistic functions. +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +This moves all of the procfs statistics code into one file, debug.c and +removes the #ifdefs from the core f2fs code when calling statistic +functions. This will make it more obvious how to move from procfs to debugfs, no functionality was changed here at all. @@ -19,6 +19,7 @@ f16 f2fs-gc.h-make-should_do_checkpoint-inline.patch f2fs-move-statistics-code-into-one-file.patch f2fs-move-proc-files-to-debugfs.patch +f2fs-make-the-debugging-files-work-only-for-the-requested-superblock.patch time-don-t-inline-export_symbol-functions.patch gregkh/gkh-version.patch |