* [PATCH] ext4: do not reference pa_inode from group_pa
@ 2012-02-08 3:39 Wu Fengguang
2012-02-11 1:10 ` Ted Ts'o
0 siblings, 1 reply; 4+ messages in thread
From: Wu Fengguang @ 2012-02-08 3:39 UTC (permalink / raw)
To: stable; +Cc: Yongqiang Yang, Ext4 Developers List, LKML
commit 60e07cf515e541ea3e13b888d273c9b19a2ad9dd upstream.
From: Yongqiang Yang <xiaoqiangnk@gmail.com>
pa_inode in group_pa is set NULL in ext4_mb_new_group_pa, so
pa_inode should be not referenced.
Reported-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
fs/ext4/mballoc.c | 2 +-
include/trace/events/ext4.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index e2d8be8..cb990b2 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -3671,7 +3671,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
ext4_group_t group;
ext4_grpblk_t bit;
- trace_ext4_mb_release_group_pa(pa);
+ trace_ext4_mb_release_group_pa(sb, pa);
BUG_ON(pa->pa_deleted == 0);
ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 748ff7c..319538b 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -573,9 +573,9 @@ TRACE_EVENT(ext4_mb_release_inode_pa,
);
TRACE_EVENT(ext4_mb_release_group_pa,
- TP_PROTO(struct ext4_prealloc_space *pa),
+ TP_PROTO(struct super_block *sb, struct ext4_prealloc_space *pa),
- TP_ARGS(pa),
+ TP_ARGS(sb, pa),
TP_STRUCT__entry(
__field( dev_t, dev )
@@ -585,7 +585,7 @@ TRACE_EVENT(ext4_mb_release_group_pa,
),
TP_fast_assign(
- __entry->dev = pa->pa_inode->i_sb->s_dev;
+ __entry->dev = sb->s_dev;
__entry->pa_pstart = pa->pa_pstart;
__entry->pa_len = pa->pa_len;
),
--
1.7.7.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ext4: do not reference pa_inode from group_pa
2012-02-08 3:39 [PATCH] ext4: do not reference pa_inode from group_pa Wu Fengguang
@ 2012-02-11 1:10 ` Ted Ts'o
0 siblings, 0 replies; 4+ messages in thread
From: Ted Ts'o @ 2012-02-11 1:10 UTC (permalink / raw)
To: Wu Fengguang; +Cc: stable, Yongqiang Yang, Ext4 Developers List, LKML
On Wed, Feb 08, 2012 at 11:39:50AM +0800, Wu Fengguang wrote:
> commit 60e07cf515e541ea3e13b888d273c9b19a2ad9dd upstream.
>
> From: Yongqiang Yang <xiaoqiangnk@gmail.com>
>
> pa_inode in group_pa is set NULL in ext4_mb_new_group_pa, so
> pa_inode should be not referenced.
>
> Reported-by: Wu Fengguang <fengguang.wu@intel.com>
> Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
I agree this should go into the stable kernel; it was an oversight
that I didn't add a cc: stable@vger.kernel.org
Acked-by: "Theodore Ts'o" <tytso@mit.edu>
- Ted
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ext4: do not reference pa_inode from group_pa
2011-12-18 3:49 Yongqiang Yang
@ 2011-12-18 21:09 ` Ted Ts'o
0 siblings, 0 replies; 4+ messages in thread
From: Ted Ts'o @ 2011-12-18 21:09 UTC (permalink / raw)
To: Yongqiang Yang; +Cc: linux-ext4
On Sun, Dec 18, 2011 at 11:49:06AM +0800, Yongqiang Yang wrote:
> pa_inode in group_pa is set NULL in ext4_mb_new_group_pa, so
> pa_inode should be not referenced.
>
> Reported-by: Wu Fengguang <fengguang.wu@intel.com>
> Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
Thanks, applied.
- Ted
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ext4: do not reference pa_inode from group_pa
@ 2011-12-18 3:49 Yongqiang Yang
2011-12-18 21:09 ` Ted Ts'o
0 siblings, 1 reply; 4+ messages in thread
From: Yongqiang Yang @ 2011-12-18 3:49 UTC (permalink / raw)
To: linux-ext4; +Cc: Yongqiang Yang
pa_inode in group_pa is set NULL in ext4_mb_new_group_pa, so
pa_inode should be not referenced.
Reported-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
---
fs/ext4/mballoc.c | 2 +-
include/trace/events/ext4.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 2268edf..d04ca8d 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -3695,7 +3695,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
ext4_group_t group;
ext4_grpblk_t bit;
- trace_ext4_mb_release_group_pa(pa);
+ trace_ext4_mb_release_group_pa(sb, pa);
BUG_ON(pa->pa_deleted == 0);
ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 748ff7c..319538b 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -573,9 +573,9 @@ TRACE_EVENT(ext4_mb_release_inode_pa,
);
TRACE_EVENT(ext4_mb_release_group_pa,
- TP_PROTO(struct ext4_prealloc_space *pa),
+ TP_PROTO(struct super_block *sb, struct ext4_prealloc_space *pa),
- TP_ARGS(pa),
+ TP_ARGS(sb, pa),
TP_STRUCT__entry(
__field( dev_t, dev )
@@ -585,7 +585,7 @@ TRACE_EVENT(ext4_mb_release_group_pa,
),
TP_fast_assign(
- __entry->dev = pa->pa_inode->i_sb->s_dev;
+ __entry->dev = sb->s_dev;
__entry->pa_pstart = pa->pa_pstart;
__entry->pa_len = pa->pa_len;
),
--
1.7.5.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-02-11 1:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-08 3:39 [PATCH] ext4: do not reference pa_inode from group_pa Wu Fengguang
2012-02-11 1:10 ` Ted Ts'o
-- strict thread matches above, loose matches on Subject: below --
2011-12-18 3:49 Yongqiang Yang
2011-12-18 21:09 ` Ted Ts'o
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.