f2fs: handle error case when adding xattr entry
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: handle error case when adding xattr entry
This patch fixes recovering incomplete xattr entries remaining in inline xattr and xattr block, caused by any kind of errors.
--- fs/f2fs/xattr.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-)
fs/f2fs/xattr.c +28 -20
@@ -389,10 +389,11 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);size_t inline_size =inline_xattr_size (inode); -void *xattr_addr; +struct page *in_page =NULL ; +void *xattr_addr, *inline_addr;struct page *xpage;nid_t new_nid =0 ; -int err; +int err =0 ;if (hsize > inline_size && !F2FS_I (inode)->i_xattr_nid)if (!alloc_nid (sbi, &new_nid))
@@ -400,30 +401,30 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,/* write to inline xattr */ if (inline_size) { -struct page *page =NULL ; -void *inline_addr; -if (ipage) { inline_addr =inline_xattr_addr (inode, ipage); -f2fs_wait_on_page_writeback (ipage,NODE , true); -set_page_dirty (ipage); }else { - page =get_node_page (sbi, inode->i_ino); -if (IS_ERR (page)) { + in_page =get_node_page (sbi, inode->i_ino); +if (IS_ERR (in_page)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (page); +return PTR_ERR (in_page); } - inline_addr =inline_xattr_addr (inode, page); -f2fs_wait_on_page_writeback (page,NODE , true); + inline_addr =inline_xattr_addr (inode, in_page); } -memcpy (inline_addr, txattr_addr, inline_size); -f2fs_put_page (page,1 ); +f2fs_wait_on_page_writeback (ipage ? ipage : in_page, +NODE , true);/* no need to use xattr node block */ if (hsize <= inline_size) { err =truncate_xattr_node (inode, ipage);alloc_nid_failed (sbi, new_nid); -return err; +if (err) { +f2fs_put_page (in_page,1 ); +return err; + } +memcpy (inline_addr, txattr_addr, inline_size); +set_page_dirty (ipage ? ipage : in_page); + goto in_page_out; } }
@@ -432,7 +433,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, xpage =get_node_page (sbi,F2FS_I (inode)->i_xattr_nid);if (IS_ERR (xpage)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (xpage); + goto in_page_out; }f2fs_bug_on (sbi, new_nid);f2fs_wait_on_page_writeback (xpage,NODE , true);
@@ -442,17 +443,24 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, xpage =new_node_page (&dn,XATTR_NODE_OFFSET );if (IS_ERR (xpage)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (xpage); + goto in_page_out; }alloc_nid_done (sbi, new_nid); } - xattr_addr =page_address (xpage); + +if (inline_size) +memcpy (inline_addr, txattr_addr, inline_size);memcpy (xattr_addr, txattr_addr + inline_size,VALID_XATTR_BLOCK_SIZE ); + +if (inline_size) +set_page_dirty (ipage ? ipage : in_page);set_page_dirty (xpage); -f2fs_put_page (xpage,1 ); -return 0 ; +f2fs_put_page (xpage,1 ); +in_page_out: +f2fs_put_page (in_page,1 ); +return err; } int f2fs_getxattr(struct inode *inode, int index, const char *name,
Signature · 1 line
2.14.0.rc1.383.gd1ce394fe2-goog
Quoted 48 lines · Jaegeuk Kim
This patch fixes recovering incomplete xattr entries remaining in inline xattr and xattr block, caused by any kind of errors.
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/xattr.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-)fs/f2fs/xattr.c +6
-12@@ -389,10 +389,11 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);size_t inline_size =inline_xattr_size (inode); -void *xattr_addr; +struct page *in_page =NULL ; +void *xattr_addr, *inline_addr;struct page *xpage;nid_t new_nid =0 ; -int err; +int err =0 ;if (hsize > inline_size && !F2FS_I (inode)->i_xattr_nid)if (!alloc_nid (sbi, &new_nid))@@ -400,30 +401,30 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,/* write to inline xattr */ if (inline_size) { -struct page *page =NULL ; -void *inline_addr; -if (ipage) { inline_addr =inline_xattr_addr (inode, ipage); -f2fs_wait_on_page_writeback (ipage,NODE , true); -set_page_dirty (ipage); }else { - page =get_node_page (sbi, inode->i_ino); -if (IS_ERR (page)) { + in_page =get_node_page (sbi, inode->i_ino); +if (IS_ERR (in_page)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (page); +return PTR_ERR (in_page); } - inline_addr =inline_xattr_addr (inode, page); -f2fs_wait_on_page_writeback (page,NODE , true);
fs/f2fs/xattr.c static inline int write_all_xattrs(struct inode *inode, __u32 hsize, · line 419
Quoted 10 lines
fs/f2fs/xattr.c +3
-2+ inline_addr =inline_xattr_addr (inode, in_page); } -memcpy (inline_addr, txattr_addr, inline_size); -f2fs_put_page (page,1 ); +f2fs_wait_on_page_writeback (ipage ? ipage : in_page, +NODE , true);/* no need to use xattr node block */ if (hsize <= inline_size) { err =truncate_xattr_node (inode, ipage);
truncate_xattr_node(inode, ipage ? ipage : in_page);
Please add:
Thanks,
Quoted 51 lines
fs/f2fs/xattr.c +19
-6alloc_nid_failed (sbi, new_nid); -return err; +if (err) { +f2fs_put_page (in_page,1 ); +return err; + } +memcpy (inline_addr, txattr_addr, inline_size); +set_page_dirty (ipage ? ipage : in_page); + goto in_page_out; } }@@ -432,7 +433,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, xpage =get_node_page (sbi,F2FS_I (inode)->i_xattr_nid);if (IS_ERR (xpage)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (xpage); + goto in_page_out; }f2fs_bug_on (sbi, new_nid);f2fs_wait_on_page_writeback (xpage,NODE , true);@@ -442,17 +443,24 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, xpage =new_node_page (&dn,XATTR_NODE_OFFSET );if (IS_ERR (xpage)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (xpage); + goto in_page_out; }alloc_nid_done (sbi, new_nid); } - xattr_addr =page_address (xpage); + +if (inline_size) +memcpy (inline_addr, txattr_addr, inline_size);memcpy (xattr_addr, txattr_addr + inline_size,VALID_XATTR_BLOCK_SIZE ); + +if (inline_size) +set_page_dirty (ipage ? ipage : in_page);set_page_dirty (xpage); -f2fs_put_page (xpage,1 ); -return 0 ; +f2fs_put_page (xpage,1 ); +in_page_out: +f2fs_put_page (in_page,1 ); +return err; } int f2fs_getxattr(struct inode *inode, int index, const char *name,
Jaegeuk Kim
maintainerQuoted 54 lines · Chao Yu
Quoted 53 lines · Jaegeuk Kim
This patch fixes recovering incomplete xattr entries remaining in inline xattr and xattr block, caused by any kind of errors.
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/xattr.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-)fs/f2fs/xattr.c +7
-14@@ -389,10 +389,11 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);size_t inline_size =inline_xattr_size (inode); -void *xattr_addr; +struct page *in_page =NULL ; +void *xattr_addr, *inline_addr;struct page *xpage;nid_t new_nid =0 ; -int err; +int err =0 ;if (hsize > inline_size && !F2FS_I (inode)->i_xattr_nid)if (!alloc_nid (sbi, &new_nid))@@ -400,30 +401,30 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,/* write to inline xattr */ if (inline_size) { -struct page *page =NULL ; -void *inline_addr; -if (ipage) { inline_addr =inline_xattr_addr (inode, ipage); -f2fs_wait_on_page_writeback (ipage,NODE , true); -set_page_dirty (ipage); }else { - page =get_node_page (sbi, inode->i_ino); -if (IS_ERR (page)) { + in_page =get_node_page (sbi, inode->i_ino); +if (IS_ERR (in_page)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (page); +return PTR_ERR (in_page); } - inline_addr =inline_xattr_addr (inode, page); -f2fs_wait_on_page_writeback (page,NODE , true); + inline_addr =inline_xattr_addr (inode, in_page); } -memcpy (inline_addr, txattr_addr, inline_size); -f2fs_put_page (page,1 );
Quoted 7 lines
fs/f2fs/xattr.c static inline int write_all_xattrs(struct inode *inode, __u32 hsize, · line 419
Quoted 5 lines
fs/f2fs/xattr.c +2
-0+f2fs_wait_on_page_writeback (ipage ? ipage : in_page, +NODE , true);/* no need to use xattr node block */ if (hsize <= inline_size) { err =truncate_xattr_node (inode, ipage);
truncate_xattr_node(inode, ipage ? ipage : in_page);
No, that should be ipage.
Thanks,
Quoted 57 lines
Please add:
Reviewed-by Chao Yu <[email protected]>Thanks,
Quoted 51 lines
fs/f2fs/xattr.c +19
-6alloc_nid_failed (sbi, new_nid); -return err; +if (err) { +f2fs_put_page (in_page,1 ); +return err; + } +memcpy (inline_addr, txattr_addr, inline_size); +set_page_dirty (ipage ? ipage : in_page); + goto in_page_out; } }@@ -432,7 +433,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, xpage =get_node_page (sbi,F2FS_I (inode)->i_xattr_nid);if (IS_ERR (xpage)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (xpage); + goto in_page_out; }f2fs_bug_on (sbi, new_nid);f2fs_wait_on_page_writeback (xpage,NODE , true);@@ -442,17 +443,24 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, xpage =new_node_page (&dn,XATTR_NODE_OFFSET );if (IS_ERR (xpage)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (xpage); + goto in_page_out; }alloc_nid_done (sbi, new_nid); } - xattr_addr =page_address (xpage); + +if (inline_size) +memcpy (inline_addr, txattr_addr, inline_size);memcpy (xattr_addr, txattr_addr + inline_size,VALID_XATTR_BLOCK_SIZE ); + +if (inline_size) +set_page_dirty (ipage ? ipage : in_page);set_page_dirty (xpage); -f2fs_put_page (xpage,1 ); -return 0 ; +f2fs_put_page (xpage,1 ); +in_page_out: +f2fs_put_page (in_page,1 ); +return err; } int f2fs_getxattr(struct inode *inode, int index, const char *name,
Quoted 63 lines · Jaegeuk Kim
Quoted 54 lines · Chao Yu
Quoted 53 lines · Jaegeuk Kim
This patch fixes recovering incomplete xattr entries remaining in inline xattr and xattr block, caused by any kind of errors.
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/xattr.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-)fs/f2fs/xattr.c +7
-14@@ -389,10 +389,11 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);size_t inline_size =inline_xattr_size (inode); -void *xattr_addr; +struct page *in_page =NULL ; +void *xattr_addr, *inline_addr;struct page *xpage;nid_t new_nid =0 ; -int err; +int err =0 ;if (hsize > inline_size && !F2FS_I (inode)->i_xattr_nid)if (!alloc_nid (sbi, &new_nid))@@ -400,30 +401,30 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,/* write to inline xattr */ if (inline_size) { -struct page *page =NULL ; -void *inline_addr; -if (ipage) { inline_addr =inline_xattr_addr (inode, ipage); -f2fs_wait_on_page_writeback (ipage,NODE , true); -set_page_dirty (ipage); }else { - page =get_node_page (sbi, inode->i_ino); -if (IS_ERR (page)) { + in_page =get_node_page (sbi, inode->i_ino); +if (IS_ERR (in_page)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (page); +return PTR_ERR (in_page); } - inline_addr =inline_xattr_addr (inode, page); -f2fs_wait_on_page_writeback (page,NODE , true); + inline_addr =inline_xattr_addr (inode, in_page); } -memcpy (inline_addr, txattr_addr, inline_size); -f2fs_put_page (page,1 );Quoted 7 lines
fs/f2fs/xattr.c static inline int write_all_xattrs(struct inode *inode, __u32 hsize, · line 419
Quoted 5 lines
fs/f2fs/xattr.c +2
-0+f2fs_wait_on_page_writeback (ipage ? ipage : in_page, +NODE , true);/* no need to use xattr node block */ if (hsize <= inline_size) { err =truncate_xattr_node (inode, ipage);
truncate_xattr_node(inode, ipage ? ipage : in_page);
Quoted 1 line
No, that should be ipage.
I just noted that dn.inode_page_locked in truncate_xattr_node will be set wrong, but, anyway, it looks that won't be problem because we didn't use inode_page_locked later.
There is no more users of ipage in truncate_xattr_node, so no matter we passing, there will be safe for us, right?
Thanks,
Quoted 58 lines
Thanks,
Quoted 55 lines
Please add:
Reviewed-by Chao Yu <[email protected]>Thanks,
Quoted 49 lines
fs/f2fs/xattr.c +19
-6alloc_nid_failed (sbi, new_nid); -return err; +if (err) { +f2fs_put_page (in_page,1 ); +return err; + } +memcpy (inline_addr, txattr_addr, inline_size); +set_page_dirty (ipage ? ipage : in_page); + goto in_page_out; } }@@ -432,7 +433,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, xpage =get_node_page (sbi,F2FS_I (inode)->i_xattr_nid);if (IS_ERR (xpage)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (xpage); + goto in_page_out; }f2fs_bug_on (sbi, new_nid);f2fs_wait_on_page_writeback (xpage,NODE , true);@@ -442,17 +443,24 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, xpage =new_node_page (&dn,XATTR_NODE_OFFSET );if (IS_ERR (xpage)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (xpage); + goto in_page_out; }alloc_nid_done (sbi, new_nid); } - xattr_addr =page_address (xpage); + +if (inline_size) +memcpy (inline_addr, txattr_addr, inline_size);memcpy (xattr_addr, txattr_addr + inline_size,VALID_XATTR_BLOCK_SIZE ); + +if (inline_size) +set_page_dirty (ipage ? ipage : in_page);set_page_dirty (xpage); -f2fs_put_page (xpage,1 ); -return 0 ; +f2fs_put_page (xpage,1 ); +in_page_out: +f2fs_put_page (in_page,1 ); +return err; }
Quoted 5 lines
Quoted 2 lines
fs/f2fs/xattr.c static inline int write_all_xattrs(struct inode *inode, __u32 hsize, · line 466
Quoted 2 lines
fs/f2fs/xattr.c +0
-0int f2fs_getxattr(struct inode *inode, int index, const char *name,.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Jaegeuk Kim
maintainerQuoted 64 lines · Chao Yu
Quoted 63 lines · Jaegeuk Kim
Quoted 61 lines · Chao Yu
Quoted 48 lines · Jaegeuk Kim
This patch fixes recovering incomplete xattr entries remaining in inline xattr and xattr block, caused by any kind of errors.
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/xattr.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-)fs/f2fs/xattr.c +6
-12@@ -389,10 +389,11 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);size_t inline_size =inline_xattr_size (inode); -void *xattr_addr; +struct page *in_page =NULL ; +void *xattr_addr, *inline_addr;struct page *xpage;nid_t new_nid =0 ; -int err; +int err =0 ;if (hsize > inline_size && !F2FS_I (inode)->i_xattr_nid)if (!alloc_nid (sbi, &new_nid))@@ -400,30 +401,30 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,/* write to inline xattr */ if (inline_size) { -struct page *page =NULL ; -void *inline_addr; -if (ipage) { inline_addr =inline_xattr_addr (inode, ipage); -f2fs_wait_on_page_writeback (ipage,NODE , true); -set_page_dirty (ipage); }else { - page =get_node_page (sbi, inode->i_ino); -if (IS_ERR (page)) { + in_page =get_node_page (sbi, inode->i_ino); +if (IS_ERR (in_page)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (page); +return PTR_ERR (in_page); } - inline_addr =inline_xattr_addr (inode, page); -f2fs_wait_on_page_writeback (page,NODE , true);fs/f2fs/xattr.c static inline int write_all_xattrs(struct inode *inode, __u32 hsize, · line 419
Quoted 10 lines
fs/f2fs/xattr.c +3
-2+ inline_addr =inline_xattr_addr (inode, in_page); } -memcpy (inline_addr, txattr_addr, inline_size); -f2fs_put_page (page,1 ); +f2fs_wait_on_page_writeback (ipage ? ipage : in_page, +NODE , true);/* no need to use xattr node block */ if (hsize <= inline_size) { err =truncate_xattr_node (inode, ipage);
truncate_xattr_node(inode, ipage ? ipage : in_page);
Quoted 8 lines
Quoted 1 line
No, that should be ipage.
I just noted that dn.inode_page_locked in
truncate_xattr_nodewill be set wrong, but, anyway, it looks that won't be problem because we didn't useinode_page_lockedlater.There is no more users of ipage in
truncate_xattr_node, so no matter we passing, there will be safe for us, right?
Oh, yes, like this?
Quoted 1 line
From
e5ae89e3c20c1c6a12cee27f6265427d99412dc8Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Thu, 19 Oct 2017 11:48:57 -0700
Subject: [PATCH] f2fs: remove obsolete pointer for truncate_xattr_node
This patch removes obosolete parameter for truncate_xattr_node.
--- fs/f2fs/f2fs.h | 2 +- fs/f2fs/node.c | 10 ++++------ fs/f2fs/xattr.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-)
fs/f2fs/f2fs.h +1 -1
@@ -2523,7 +2523,7 @@ void get_node_info(struct f2fs_sb_info *sbi, nid_t nid, struct node_info *ni);pgoff_t get_next_page_offset (struct dnode_of_data *dn,pgoff_t pgofs);int get_dnode_of_data (struct dnode_of_data *dn,pgoff_t index,int mode);int truncate_inode_blocks (struct inode *inode,pgoff_t from); -int truncate_xattr_node (struct inode *inode,struct page *page); +int truncate_xattr_node (struct inode *inode);int wait_on_node_pages_writeback (struct f2fs_sb_info *sbi,nid_t ino);int remove_inode_page (struct inode *inode);struct page *new_inode_page (struct inode *inode);
fs/f2fs/node.c +4 -6
@@ -962,7 +962,8 @@ int truncate_inode_blocks(struct inode *inode, pgoff_t from)return err >0 ?0 : err; } -int truncate_xattr_node (struct inode *inode,struct page *page) +/* caller must lock inode page */ +int truncate_xattr_node (struct inode *inode) {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);nid_t nid =F2FS_I (inode)->i_xattr_nid;
@@ -978,10 +979,7 @@ int truncate_xattr_node(struct inode *inode, struct page *page)f2fs_i_xnid_write (inode,0 ); -set_new_dnode (&dn, inode, page, npage, nid); - -if (page) - dn.inode_page_locked = true; +set_new_dnode (&dn, inode,NULL , npage, nid);truncate_node (&dn);return 0 ; }
@@ -1000,7 +998,7 @@ int remove_inode_page(struct inode *inode)if (err)return err; - err =truncate_xattr_node (inode, dn.inode_page); + err =truncate_xattr_node (inode);if (err) {f2fs_put_dnode (&dn);return err;
fs/f2fs/xattr.c +1 -1
@@ -416,7 +416,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, NODE, true);/* no need to use xattr node block */ if (hsize <= inline_size) { - err =truncate_xattr_node (inode, ipage); + err =truncate_xattr_node (inode);alloc_nid_failed (sbi, new_nid);if (err) {f2fs_put_page (in_page,1 );
Signature · 1 line
2.14.0.rc1.383.gd1ce394fe2-goog
Chao Yu
maintainerQuoted 67 lines · Jaegeuk Kim
Quoted 66 lines · Chao Yu
Quoted 64 lines · Jaegeuk Kim
Quoted 54 lines · Chao Yu
Quoted 53 lines · Jaegeuk Kim
This patch fixes recovering incomplete xattr entries remaining in inline xattr and xattr block, caused by any kind of errors.
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/xattr.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-)fs/f2fs/xattr.c +7
-14@@ -389,10 +389,11 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);size_t inline_size =inline_xattr_size (inode); -void *xattr_addr; +struct page *in_page =NULL ; +void *xattr_addr, *inline_addr;struct page *xpage;nid_t new_nid =0 ; -int err; +int err =0 ;if (hsize > inline_size && !F2FS_I (inode)->i_xattr_nid)if (!alloc_nid (sbi, &new_nid))@@ -400,30 +401,30 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,/* write to inline xattr */ if (inline_size) { -struct page *page =NULL ; -void *inline_addr; -if (ipage) { inline_addr =inline_xattr_addr (inode, ipage); -f2fs_wait_on_page_writeback (ipage,NODE , true); -set_page_dirty (ipage); }else { - page =get_node_page (sbi, inode->i_ino); -if (IS_ERR (page)) { + in_page =get_node_page (sbi, inode->i_ino); +if (IS_ERR (in_page)) {alloc_nid_failed (sbi, new_nid); -return PTR_ERR (page); +return PTR_ERR (in_page); } - inline_addr =inline_xattr_addr (inode, page); -f2fs_wait_on_page_writeback (page,NODE , true); + inline_addr =inline_xattr_addr (inode, in_page); } -memcpy (inline_addr, txattr_addr, inline_size); -f2fs_put_page (page,1 );Quoted 7 lines
fs/f2fs/xattr.c static inline int write_all_xattrs(struct inode *inode, __u32 hsize, · line 419
Quoted 5 lines
fs/f2fs/xattr.c +2
-0+f2fs_wait_on_page_writeback (ipage ? ipage : in_page, +NODE , true);/* no need to use xattr node block */ if (hsize <= inline_size) { err =truncate_xattr_node (inode, ipage);
truncate_xattr_node(inode, ipage ? ipage : in_page);No, that should be ipage.
Quoted 8 lines
Quoted 6 lines
I just noted that dn.inode_page_locked in
truncate_xattr_nodewill be set wrong, but, anyway, it looks that won't be problem because we didn't useinode_page_lockedlater.There is no more users of ipage in
truncate_xattr_node, so no matter we passing, there will be safe for us, right?Oh, yes, like this?
Yup, ;)
Thanks,
Quoted 78 lines
From
e5ae89e3c20c1c6a12cee27f6265427d99412dc8Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Thu, 19 Oct 2017 11:48:57 -0700
Subject: [PATCH] f2fs: remove obsolete pointer fortruncate_xattr_nodeThis patch removes obosolete parameter for
truncate_xattr_node.Suggested-by Chao Yu <[email protected]>Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/f2fs.h | 2 +- fs/f2fs/node.c | 10 ++++------ fs/f2fs/xattr.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-)fs/f2fs/f2fs.h +1
-1@@ -2523,7 +2523,7 @@ void get_node_info(struct f2fs_sb_info *sbi, nid_t nid, struct node_info *ni);pgoff_t get_next_page_offset (struct dnode_of_data *dn,pgoff_t pgofs);int get_dnode_of_data (struct dnode_of_data *dn,pgoff_t index,int mode);int truncate_inode_blocks (struct inode *inode,pgoff_t from); -int truncate_xattr_node (struct inode *inode,struct page *page); +int truncate_xattr_node (struct inode *inode);int wait_on_node_pages_writeback (struct f2fs_sb_info *sbi,nid_t ino);int remove_inode_page (struct inode *inode);struct page *new_inode_page (struct inode *inode);fs/f2fs/node.c +4
-6@@ -962,7 +962,8 @@ int truncate_inode_blocks(struct inode *inode, pgoff_t from)return err >0 ?0 : err; } -int truncate_xattr_node (struct inode *inode,struct page *page) +/* caller must lock inode page */ +int truncate_xattr_node (struct inode *inode) {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);nid_t nid =F2FS_I (inode)->i_xattr_nid;@@ -978,10 +979,7 @@ int truncate_xattr_node(struct inode *inode, struct page *page)f2fs_i_xnid_write (inode,0 ); -set_new_dnode (&dn, inode, page, npage, nid); - -if (page) - dn.inode_page_locked = true; +set_new_dnode (&dn, inode,NULL , npage, nid);truncate_node (&dn);return 0 ; }@@ -1000,7 +998,7 @@ int remove_inode_page(struct inode *inode)if (err)return err; - err =truncate_xattr_node (inode, dn.inode_page); + err =truncate_xattr_node (inode);if (err) {f2fs_put_dnode (&dn);return err;fs/f2fs/xattr.c +1
-1@@ -416,7 +416,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, NODE, true);/* no need to use xattr node block */ if (hsize <= inline_size) { - err =truncate_xattr_node (inode, ipage); + err =truncate_xattr_node (inode);alloc_nid_failed (sbi, new_nid);if (err) {f2fs_put_page (in_page,1 );