diff options
| author |   Denis V. Lunev <den@openvz.org> | 2008-04-29 01:02:11 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 08:06:20 -0700 |
| commit | 79da3664f61640057041bf172b1457e2d1969330 (patch) | |
| tree | 5ece267f93f91fd1183998b03af986f6afc7450c | |
| parent | reiserfs: use non-racy method for proc entries creation (diff) | |
| download | linux-dev-79da3664f61640057041bf172b1457e2d1969330.tar.xz linux-dev-79da3664f61640057041bf172b1457e2d1969330.zip | |
jbd2: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Cc: <linux-ext4@vger.kernel.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/jbd2/journal.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 954cff001df6..eb7eb6c27bcb 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -904,19 +904,10 @@ static void jbd2_stats_proc_init(journal_t *journal) snprintf(name, sizeof(name) - 1, "%s", bdevname(journal->j_dev, name)); journal->j_proc_entry = proc_mkdir(name, proc_jbd2_stats); if (journal->j_proc_entry) { - struct proc_dir_entry *p; - p = create_proc_entry("history", S_IRUGO, - journal->j_proc_entry); - if (p) { - p->proc_fops = &jbd2_seq_history_fops; - p->data = journal; - p = create_proc_entry("info", S_IRUGO, - journal->j_proc_entry); - if (p) { - p->proc_fops = &jbd2_seq_info_fops; - p->data = journal; - } - } + proc_create_data("history", S_IRUGO, journal->j_proc_entry, + &jbd2_seq_history_fops, journal); + proc_create_data("info", S_IRUGO, journal->j_proc_entry, + &jbd2_seq_info_fops, journal); } } |