[PATCH resend] jbd2_stats_proc_init wrong place.

[PATCH resend] jbd2_stats_proc_init wrong place.

[yangsheng]

 The jbd2_stats_proc_init() was placed on wrong location in
 jbd2_journal_init_dev().  This may cause /proc/fs/jdb2/<dev>/*
 cannot be created when using external journal device.

 Reviewed-by: Andreas Dilger <andreas.dilger@oracle.com>

---
---
 fs/jbd2/journal.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index c590d15..f837ba9 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -899,6 +899,14 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,
 
 	/* journal descriptor can store up to n blocks -bzzz */
 	journal->j_blocksize = blocksize;
+	journal->j_dev = bdev;
+	journal->j_fs_dev = fs_dev;
+	journal->j_blk_offset = start;
+	journal->j_maxlen = len;
+	bdevname(journal->j_dev, journal->j_devname);
+	p = journal->j_devname;
+	while ((p = strchr(p, '/')))
+		*p = '!';
 	jbd2_stats_proc_init(journal);
 	n = journal->j_blocksize / sizeof(journal_block_tag_t);
 	journal->j_wbufsize = n;
@@ -908,14 +916,6 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,
 			__func__);
 		goto out_err;
 	}
-	journal->j_dev = bdev;
-	journal->j_fs_dev = fs_dev;
-	journal->j_blk_offset = start;
-	journal->j_maxlen = len;
-	bdevname(journal->j_dev, journal->j_devname);
-	p = journal->j_devname;
-	while ((p = strchr(p, '/')))
-		*p = '!';
 
 	bh = __getblk(journal->j_dev, start, journal->j_blocksize);
 	if (!bh) {
-- 
1.7.2.3

Re: [PATCH resend] jbd2_stats_proc_init wrong place.

[Lukas Czerner]

On Tue, 16 Nov 2010, yangsheng wrote:

>  The jbd2_stats_proc_init() was placed on wrong location in
>  jbd2_journal_init_dev().  This may cause /proc/fs/jdb2/<dev>/*
>  cannot be created when using external journal device.
> 
>  Reviewed-by: Andreas Dilger <andreas.dilger@oracle.com>

Code looks good to me and after a quick testing it seems to be working
properly.

-Lukas

> 
> ---
> ---
>  fs/jbd2/journal.c |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index c590d15..f837ba9 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -899,6 +899,14 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,
>  
>  	/* journal descriptor can store up to n blocks -bzzz */
>  	journal->j_blocksize = blocksize;
> +	journal->j_dev = bdev;
> +	journal->j_fs_dev = fs_dev;
> +	journal->j_blk_offset = start;
> +	journal->j_maxlen = len;
> +	bdevname(journal->j_dev, journal->j_devname);
> +	p = journal->j_devname;
> +	while ((p = strchr(p, '/')))
> +		*p = '!';
>  	jbd2_stats_proc_init(journal);
>  	n = journal->j_blocksize / sizeof(journal_block_tag_t);
>  	journal->j_wbufsize = n;
> @@ -908,14 +916,6 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,
>  			__func__);
>  		goto out_err;
>  	}
> -	journal->j_dev = bdev;
> -	journal->j_fs_dev = fs_dev;
> -	journal->j_blk_offset = start;
> -	journal->j_maxlen = len;
> -	bdevname(journal->j_dev, journal->j_devname);
> -	p = journal->j_devname;
> -	while ((p = strchr(p, '/')))
> -		*p = '!';
>  
>  	bh = __getblk(journal->j_dev, start, journal->j_blocksize);
>  	if (!bh) {
> 

-- 

Re: [PATCH resend] jbd2_stats_proc_init wrong place.

[Ted Ts'o]

On Tue, Nov 16, 2010 at 03:31:44PM +0800, yangsheng wrote:
>  The jbd2_stats_proc_init() was placed on wrong location in
>  jbd2_journal_init_dev().  This may cause /proc/fs/jdb2/<dev>/*
>  cannot be created when using external journal device.
> 
>  Reviewed-by: Andreas Dilger <andreas.dilger@oracle.com>

Hi Yang Sheng --- you didn't add a Signed-off-by line.  Can you
confirm that it was your intention to add a:

Signed-off-by: yangsheng <sheng.yang@oracle.com>

... per the "Developer's Certificate of Origin 1.1" as found in
/usr/src/linux/Documentation/SubmittingPatches?

Many thanks,

					- Ted

Re: [PATCH resend] jbd2_stats_proc_init wrong place.

[yangsheng]

On 11/17/2010 05:01 AM, Ted Ts'o wrote:
> On Tue, Nov 16, 2010 at 03:31:44PM +0800, yangsheng wrote:
>    
>>   The jbd2_stats_proc_init() was placed on wrong location in
>>   jbd2_journal_init_dev().  This may cause /proc/fs/jdb2/<dev>/*
>>   cannot be created when using external journal device.
>>
>>   Reviewed-by: Andreas Dilger<andreas.dilger@oracle.com>
>>      
> Hi Yang Sheng --- you didn't add a Signed-off-by line.  Can you
> confirm that it was your intention to add a:
>
> Signed-off-by: yangsheng<sheng.yang@oracle.com>
>
> ... per the "Developer's Certificate of Origin 1.1" as found in
> /usr/src/linux/Documentation/SubmittingPatches?
>    
Sure, you are right. I am forgot to add this line. Could you
please add it directly or i resent with this line? TIA.

Thanks
YangSheng

Re: [PATCH resend] jbd2_stats_proc_init wrong place.

[Ted Ts'o]

On Wed, Nov 17, 2010 at 04:17:42PM +0800, yangsheng wrote:
> Sure, you are right. I am forgot to add this line. Could you
> please add it directly or i resent with this line? TIA.

No, that's fine.  Thanks, I've added your patch to the ext4 patch
queue.

					- Ted