ocfs2: use retval instead of status for checking error
PATCH 1/1 ocfs2: use retval instead of status for checking error
The use of 'status' in __ocfs2_add_entry() can return wrong value. Some functions' return value in __ocfs2_add_entry(), i.e ocfs2_journal_access_di() is saved to 'status'. But 'status' is not used in 'bail' label for returning result of __ocfs2_add_entry().
So use retval instead of status.
---
This patch was came from 'https://lkml.org/lkml/2015/2/27/655' This patch was needed to test but I didn't have any environment for testing ocfs2 filesystem. But I have one, now.
(I'm too busy to make this enviroment. And qemu for this fs is difficult
for me. :-(, sorry for that)
Briefly how to set my environment for testing this fs with qemu.
1. Getting and building linux kernel with linux-next branch for x86_64 qemu. And also options of ocfs2 related are enabled(built-in)
2. Makes own root file system with 'buildroot' project.
3. Getting and building ocfs2-tools.
Then binaries after building this tool are moved my rootfs.
4. Makes dummy disk image(5G) which will be formatted in qemu.
5. Booting qemu with rootfs image and dummy disk image.
6. mkfs.ocfs2 --fs-feature=local <device>
this maybe possilbe to mount standalone mode.
7. tunefs.ocfs2 --fs-features=indexed-dirs,noinline-data <device>
8. make a cluster and one node
use o2cb_ctl tool.
9. o2cb service load and initialize
# /etc/init.d/o2cb load && /etc/init.d/o2cb configure # /etc/init.d/o2cb online 10. mount ocfs2 # mount.ocfs2 <device> <some directory>
And use GDB for debugging my patch path.
Connect gdb with qemu and add breakpoint in __ocfs2_add_entry() of fs/ocfs2/dir.c
And test my patch.
# cd <some directory mounted with ocfs2> # mkdir <specific directory>
This how-to is not written all my work, just briefly I said.
fs/ocfs2/dir.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
fs/ocfs2/dir.c +10 -10
@@ -1607,7 +1607,7 @@ int __ocfs2_add_entry(handle_t *handle,struct ocfs2_dir_entry *de, *de1;struct ocfs2_dinode *di = (struct ocfs2_dinode *)parent_fe_bh->b_data;struct super_block *sb = dir->i_sb; -int retval, status; +int retval;unsigned int size = sb->s_blocksize;struct buffer_head *insert_bh = lookup->dl_leaf_bh;char *data_start = insert_bh->b_data;
@@ -1685,25 +1685,25 @@ int __ocfs2_add_entry(handle_t *handle, }if (insert_bh == parent_fe_bh) - status =ocfs2_journal_access_di (handle, + retval =ocfs2_journal_access_di (handle,INODE_CACHE (dir), insert_bh,OCFS2_JOURNAL_ACCESS_WRITE );else { - status =ocfs2_journal_access_db (handle, + retval =ocfs2_journal_access_db (handle,INODE_CACHE (dir), insert_bh,OCFS2_JOURNAL_ACCESS_WRITE ); -if (ocfs2_dir_indexed (dir)) { - status =ocfs2_dx_dir_insert (dir, +if (!retval &&ocfs2_dir_indexed (dir)) + retval =ocfs2_dx_dir_insert (dir, handle, lookup); -if (status) { -mlog_errno (status); - goto bail; - } - } + } + +if (retval) { +mlog_errno (retval); + goto bail; }/* By now the buffer is marked for journaling */
Signature · 1 line
1.7.1
PATCH 1/1 ocfs2: use retval instead of status for checking error
Hi, Joseph.
Can you review this patch again, actually you had reviewed by
'https://lkml.org/lkml/2015/2/27/655'.
Thanks.
regards,
Daeseok Youn
2015-04-19 14:43 GMT+09:00 Daeseok Youn <[email protected]>:
Quoted 101 lines
The use of 'status' in
__ocfs2_add_entry()can return wrong value. Some functions' return value in__ocfs2_add_entry(), i.eocfs2_journal_access_di()is saved to 'status'. But 'status' is not used in 'bail' label for returning result of__ocfs2_add_entry().So use retval instead of status.
Signed-off-by Daeseok Youn <[email protected]>---
This patch was came from 'https://lkml.org/lkml/2015/2/27/655' This patch was needed to test but I didn't have any environment for testing ocfs2 filesystem. But I have one, now.
(I'm too busy to make this enviroment. And qemu for this fs is difficult
for me. :-(, sorry for that)Briefly how to set my environment for testing this fs with qemu.
1. Getting and building linux kernel with linux-next branch forx86_64qemu.
And also options of ocfs2 related are enabled(built-in)
2. Makes own root file system with 'buildroot' project.
3. Getting and building ocfs2-tools.
Then binaries after building this tool are moved my rootfs.
4. Makes dummy disk image(5G) which will be formatted in qemu.
5. Booting qemu with rootfs image and dummy disk image.
6. mkfs.ocfs2 --fs-feature=local <device>
this maybe possilbe to mount standalone mode.
7. tunefs.ocfs2 --fs-features=indexed-dirs,noinline-data <device>
8. make a cluster and one node
useo2cb_ctltool.
9. o2cb service load and initialize# /etc/init.d/o2cb load && /etc/init.d/o2cb configure # /etc/init.d/o2cb online 10. mount ocfs2 # mount.ocfs2 <device> <some directory>And use GDB for debugging my patch path.
Connect gdb with qemu and add breakpoint in__ocfs2_add_entry()offs/ocfs2/dir.cAnd test my patch.
# cd <some directory mounted with ocfs2> # mkdir <specific directory>This how-to is not written all my work, just briefly I said.
fs/ocfs2/dir.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)fs/ocfs2/dir.c +1
-1@@ -1607,7 +1607,7 @@ int __ocfs2_add_entry(handle_t *handle,struct ocfs2_dir_entry *de, *de1;struct ocfs2_dinode *di = (struct ocfs2_dinode *)parent_fe_bh->b_data;struct super_block *sb = dir->i_sb; -int retval, status; +int retval;unsigned int size = sb->s_blocksize;struct buffer_head *insert_bh = lookup->dl_leaf_bh;char *data_start = insert_bh->b_data;fs/ocfs2/dir.c +9
-9@@ -1685,25 +1685,25 @@ int __ocfs2_add_entry(handle_t *handle, }if (insert_bh == parent_fe_bh) - status =ocfs2_journal_access_di (handle, + retval =ocfs2_journal_access_di (handle,INODE_CACHE (dir), insert_bh,OCFS2_JOURNAL_ACCESS_WRITE );else { - status =ocfs2_journal_access_db (handle, + retval =ocfs2_journal_access_db (handle,INODE_CACHE (dir), insert_bh,OCFS2_JOURNAL_ACCESS_WRITE ); -if (ocfs2_dir_indexed (dir)) { - status =ocfs2_dx_dir_insert (dir, +if (!retval &&ocfs2_dir_indexed (dir)) + retval =ocfs2_dx_dir_insert (dir, handle, lookup); -if (status) { -mlog_errno (status); - goto bail; - } - } + } + +if (retval) { +mlog_errno (retval); + goto bail;} /* By now the buffer is marked for journaling */
Quoted 4 lines
--
1.7.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://oss.oracle.com/pipermail/ocfs2-devel/attachments/20150422/4414adab/attachment.html
Quoted 9 lines · Daeseok Youn
The use of 'status' in
__ocfs2_add_entry()can return wrong value. Some functions' return value in__ocfs2_add_entry(), i.eocfs2_journal_access_di()is saved to 'status'. But 'status' is not used in 'bail' label for returning result of__ocfs2_add_entry().So use retval instead of status.
Signed-off-by Daeseok Youn <[email protected]>
Quoted 87 lines
---
This patch was came from 'https://lkml.org/lkml/2015/2/27/655' This patch was needed to test but I didn't have any environment for testing ocfs2 filesystem. But I have one, now.
(I'm too busy to make this enviroment. And qemu for this fs is difficult
for me. :-(, sorry for that)Briefly how to set my environment for testing this fs with qemu.
1. Getting and building linux kernel with linux-next branch forx86_64qemu. And also options of ocfs2 related are enabled(built-in)
2. Makes own root file system with 'buildroot' project.
3. Getting and building ocfs2-tools.
Then binaries after building this tool are moved my rootfs.
4. Makes dummy disk image(5G) which will be formatted in qemu.
5. Booting qemu with rootfs image and dummy disk image.
6. mkfs.ocfs2 --fs-feature=local <device>
this maybe possilbe to mount standalone mode.
7. tunefs.ocfs2 --fs-features=indexed-dirs,noinline-data <device>
8. make a cluster and one node
useo2cb_ctltool.
9. o2cb service load and initialize# /etc/init.d/o2cb load && /etc/init.d/o2cb configure # /etc/init.d/o2cb online 10. mount ocfs2 # mount.ocfs2 <device> <some directory>And use GDB for debugging my patch path.
Connect gdb with qemu and add breakpoint in__ocfs2_add_entry()offs/ocfs2/dir.cAnd test my patch.
# cd <some directory mounted with ocfs2> # mkdir <specific directory>This how-to is not written all my work, just briefly I said.
fs/ocfs2/dir.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)fs/ocfs2/dir.c +10
-10@@ -1607,7 +1607,7 @@ int __ocfs2_add_entry(handle_t *handle,struct ocfs2_dir_entry *de, *de1;struct ocfs2_dinode *di = (struct ocfs2_dinode *)parent_fe_bh->b_data;struct super_block *sb = dir->i_sb; -int retval, status; +int retval;unsigned int size = sb->s_blocksize;struct buffer_head *insert_bh = lookup->dl_leaf_bh;char *data_start = insert_bh->b_data;@@ -1685,25 +1685,25 @@ int __ocfs2_add_entry(handle_t *handle, }if (insert_bh == parent_fe_bh) - status =ocfs2_journal_access_di (handle, + retval =ocfs2_journal_access_di (handle,INODE_CACHE (dir), insert_bh,OCFS2_JOURNAL_ACCESS_WRITE );else { - status =ocfs2_journal_access_db (handle, + retval =ocfs2_journal_access_db (handle,INODE_CACHE (dir), insert_bh,OCFS2_JOURNAL_ACCESS_WRITE ); -if (ocfs2_dir_indexed (dir)) { - status =ocfs2_dx_dir_insert (dir, +if (!retval &&ocfs2_dir_indexed (dir)) + retval =ocfs2_dx_dir_insert (dir, handle, lookup); -if (status) { -mlog_errno (status); - goto bail; - } - } + } + +if (retval) { +mlog_errno (retval); + goto bail; }/* By now the buffer is marked for journaling */
Hi, Joseph.
2015-04-23 9:49 GMT+09:00 Joseph Qi <[email protected]>:
Quoted 7 lines · Daeseok Youn
Quoted 6 lines
The use of 'status' in
__ocfs2_add_entry()can return wrong value. Some functions' return value in__ocfs2_add_entry(), i.eocfs2_journal_access_di()is saved to 'status'. But 'status' is not used in 'bail' label for returning result of__ocfs2_add_entry().
Quoted 5 lines
Quoted 3 lines
So use retval instead of status.
Signed-off-by Daeseok Youn <[email protected]>Reviewed-by Joseph Qi <[email protected]>
Thanks for review.
regards,
Daeseok Youn.
Quoted 89 lines
Quoted 87 lines
---
This patch was came from 'https://lkml.org/lkml/2015/2/27/655' This patch was needed to test but I didn't have any environment for testing ocfs2 filesystem. But I have one, now.
(I'm too busy to make this enviroment. And qemu for this fs is difficult
for me. :-(, sorry for that)Briefly how to set my environment for testing this fs with qemu.
1. Getting and building linux kernel with linux-next branch forx86_64qemu. And also options of ocfs2 related are enabled(built-in)
2. Makes own root file system with 'buildroot' project.
3. Getting and building ocfs2-tools.
Then binaries after building this tool are moved my rootfs.
4. Makes dummy disk image(5G) which will be formatted in qemu.
5. Booting qemu with rootfs image and dummy disk image.
6. mkfs.ocfs2 --fs-feature=local <device>
this maybe possilbe to mount standalone mode.
7. tunefs.ocfs2 --fs-features=indexed-dirs,noinline-data <device>
8. make a cluster and one node
useo2cb_ctltool.
9. o2cb service load and initialize# /etc/init.d/o2cb load && /etc/init.d/o2cb configure # /etc/init.d/o2cb online 10. mount ocfs2 # mount.ocfs2 <device> <some directory>And use GDB for debugging my patch path.
Connect gdb with qemu and add breakpoint in__ocfs2_add_entry()offs/ocfs2/dir.cAnd test my patch.
# cd <some directory mounted with ocfs2> # mkdir <specific directory>This how-to is not written all my work, just briefly I said.
fs/ocfs2/dir.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)fs/ocfs2/dir.c +10
-10@@ -1607,7 +1607,7 @@ int __ocfs2_add_entry(handle_t *handle,struct ocfs2_dir_entry *de, *de1;struct ocfs2_dinode *di = (struct ocfs2_dinode *)parent_fe_bh->b_data;struct super_block *sb = dir->i_sb; -int retval, status; +int retval;unsigned int size = sb->s_blocksize;struct buffer_head *insert_bh = lookup->dl_leaf_bh;char *data_start = insert_bh->b_data;@@ -1685,25 +1685,25 @@ int __ocfs2_add_entry(handle_t *handle, }if (insert_bh == parent_fe_bh) - status =ocfs2_journal_access_di (handle, + retval =ocfs2_journal_access_di (handle,INODE_CACHE (dir), insert_bh,OCFS2_JOURNAL_ACCESS_WRITE );else { - status =ocfs2_journal_access_db (handle, + retval =ocfs2_journal_access_db (handle,INODE_CACHE (dir), insert_bh,OCFS2_JOURNAL_ACCESS_WRITE ); -if (ocfs2_dir_indexed (dir)) { - status =ocfs2_dx_dir_insert (dir, +if (!retval &&ocfs2_dir_indexed (dir)) + retval =ocfs2_dx_dir_insert (dir, handle, lookup); -if (status) { -mlog_errno (status); - goto bail; - } - } + } + +if (retval) { +mlog_errno (retval); + goto bail; }/* By now the buffer is marked for journaling */
Hi, Andrew.
Is there problem this patch to merge?
If you care about mlog_errno() cleanup, I will send another patch for that.
And also if you have any reasons this patch has not been taken, please let me know. I will fix and test again.
Thanks.
regards,
Daeseok Youn/
2015-04-23 9:49 GMT+09:00 Joseph Qi <[email protected]>:
Quoted 101 lines · Daeseok Youn
Quoted 9 lines
The use of 'status' in
__ocfs2_add_entry()can return wrong value. Some functions' return value in__ocfs2_add_entry(), i.eocfs2_journal_access_di()is saved to 'status'. But 'status' is not used in 'bail' label for returning result of__ocfs2_add_entry().So use retval instead of status.
Signed-off-by Daeseok Youn <[email protected]>Reviewed-by Joseph Qi <[email protected]>Quoted 87 lines
---
This patch was came from 'https://lkml.org/lkml/2015/2/27/655' This patch was needed to test but I didn't have any environment for testing ocfs2 filesystem. But I have one, now.
(I'm too busy to make this enviroment. And qemu for this fs is difficult
for me. :-(, sorry for that)Briefly how to set my environment for testing this fs with qemu.
1. Getting and building linux kernel with linux-next branch forx86_64qemu. And also options of ocfs2 related are enabled(built-in)
2. Makes own root file system with 'buildroot' project.
3. Getting and building ocfs2-tools.
Then binaries after building this tool are moved my rootfs.
4. Makes dummy disk image(5G) which will be formatted in qemu.
5. Booting qemu with rootfs image and dummy disk image.
6. mkfs.ocfs2 --fs-feature=local <device>
this maybe possilbe to mount standalone mode.
7. tunefs.ocfs2 --fs-features=indexed-dirs,noinline-data <device>
8. make a cluster and one node
useo2cb_ctltool.
9. o2cb service load and initialize# /etc/init.d/o2cb load && /etc/init.d/o2cb configure # /etc/init.d/o2cb online 10. mount ocfs2 # mount.ocfs2 <device> <some directory>And use GDB for debugging my patch path.
Connect gdb with qemu and add breakpoint in__ocfs2_add_entry()offs/ocfs2/dir.cAnd test my patch.
# cd <some directory mounted with ocfs2> # mkdir <specific directory>This how-to is not written all my work, just briefly I said.
fs/ocfs2/dir.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)fs/ocfs2/dir.c +10
-10@@ -1607,7 +1607,7 @@ int __ocfs2_add_entry(handle_t *handle,struct ocfs2_dir_entry *de, *de1;struct ocfs2_dinode *di = (struct ocfs2_dinode *)parent_fe_bh->b_data;struct super_block *sb = dir->i_sb; -int retval, status; +int retval;unsigned int size = sb->s_blocksize;struct buffer_head *insert_bh = lookup->dl_leaf_bh;char *data_start = insert_bh->b_data;@@ -1685,25 +1685,25 @@ int __ocfs2_add_entry(handle_t *handle, }if (insert_bh == parent_fe_bh) - status =ocfs2_journal_access_di (handle, + retval =ocfs2_journal_access_di (handle,INODE_CACHE (dir), insert_bh,OCFS2_JOURNAL_ACCESS_WRITE );else { - status =ocfs2_journal_access_db (handle, + retval =ocfs2_journal_access_db (handle,INODE_CACHE (dir), insert_bh,OCFS2_JOURNAL_ACCESS_WRITE ); -if (ocfs2_dir_indexed (dir)) { - status =ocfs2_dx_dir_insert (dir, +if (!retval &&ocfs2_dir_indexed (dir)) + retval =ocfs2_dx_dir_insert (dir, handle, lookup); -if (status) { -mlog_errno (status); - goto bail; - } - } + } + +if (retval) { +mlog_errno (retval); + goto bail; }/* By now the buffer is marked for journaling */