aboutsummaryrefslogtreecommitdiffstats
path: root/fs/logfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/logfs')
-rw-r--r--fs/logfs/dir.c2
-rw-r--r--fs/logfs/inode.c2
-rw-r--r--fs/logfs/logfs.h2
-rw-r--r--fs/logfs/readwrite.c12
4 files changed, 9 insertions, 9 deletions
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
index b7d7f67cee5a..b6404898da83 100644
--- a/fs/logfs/dir.c
+++ b/fs/logfs/dir.c
@@ -71,7 +71,7 @@ static int write_dir(struct inode *dir, struct logfs_disk_dentry *dd,
71 71
72static int write_inode(struct inode *inode) 72static int write_inode(struct inode *inode)
73{ 73{
74 return __logfs_write_inode(inode, WF_LOCK); 74 return __logfs_write_inode(inode, NULL, WF_LOCK);
75} 75}
76 76
77static s64 dir_seek_data(struct inode *inode, s64 pos) 77static s64 dir_seek_data(struct inode *inode, s64 pos)
diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c
index 388d7c5a7bed..7c42c132c177 100644
--- a/fs/logfs/inode.c
+++ b/fs/logfs/inode.c
@@ -287,7 +287,7 @@ static int logfs_write_inode(struct inode *inode, struct writeback_control *wbc)
287 if (logfs_inode(inode)->li_flags & LOGFS_IF_STILLBORN) 287 if (logfs_inode(inode)->li_flags & LOGFS_IF_STILLBORN)
288 return 0; 288 return 0;
289 289
290 ret = __logfs_write_inode(inode, flags); 290 ret = __logfs_write_inode(inode, NULL, flags);
291 LOGFS_BUG_ON(ret, inode->i_sb); 291 LOGFS_BUG_ON(ret, inode->i_sb);
292 return ret; 292 return ret;
293} 293}
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h
index bb4340850c1b..0dec29887a8a 100644
--- a/fs/logfs/logfs.h
+++ b/fs/logfs/logfs.h
@@ -528,7 +528,7 @@ void logfs_destroy_inode_cache(void);
528void logfs_set_blocks(struct inode *inode, u64 no); 528void logfs_set_blocks(struct inode *inode, u64 no);
529/* these logically belong into inode.c but actually reside in readwrite.c */ 529/* these logically belong into inode.c but actually reside in readwrite.c */
530int logfs_read_inode(struct inode *inode); 530int logfs_read_inode(struct inode *inode);
531int __logfs_write_inode(struct inode *inode, long flags); 531int __logfs_write_inode(struct inode *inode, struct page *, long flags);
532void logfs_evict_inode(struct inode *inode); 532void logfs_evict_inode(struct inode *inode);
533 533
534/* journal.c */ 534/* journal.c */
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c
index 7b10e8aecced..88284c67ba97 100644
--- a/fs/logfs/readwrite.c
+++ b/fs/logfs/readwrite.c
@@ -422,7 +422,7 @@ static void inode_write_block(struct logfs_block *block)
422 if (inode->i_ino == LOGFS_INO_MASTER) 422 if (inode->i_ino == LOGFS_INO_MASTER)
423 logfs_write_anchor(inode->i_sb); 423 logfs_write_anchor(inode->i_sb);
424 else { 424 else {
425 ret = __logfs_write_inode(inode, 0); 425 ret = __logfs_write_inode(inode, NULL, 0);
426 /* see indirect_write_block comment */ 426 /* see indirect_write_block comment */
427 BUG_ON(ret); 427 BUG_ON(ret);
428 } 428 }
@@ -1629,7 +1629,7 @@ int logfs_rewrite_block(struct inode *inode, u64 bix, u64 ofs,
1629 if (inode->i_ino == LOGFS_INO_MASTER) 1629 if (inode->i_ino == LOGFS_INO_MASTER)
1630 logfs_write_anchor(inode->i_sb); 1630 logfs_write_anchor(inode->i_sb);
1631 else { 1631 else {
1632 err = __logfs_write_inode(inode, flags); 1632 err = __logfs_write_inode(inode, page, flags);
1633 } 1633 }
1634 } 1634 }
1635 } 1635 }
@@ -1879,7 +1879,7 @@ int logfs_truncate(struct inode *inode, u64 target)
1879 logfs_get_wblocks(sb, NULL, 1); 1879 logfs_get_wblocks(sb, NULL, 1);
1880 err = __logfs_truncate(inode, size); 1880 err = __logfs_truncate(inode, size);
1881 if (!err) 1881 if (!err)
1882 err = __logfs_write_inode(inode, 0); 1882 err = __logfs_write_inode(inode, NULL, 0);
1883 logfs_put_wblocks(sb, NULL, 1); 1883 logfs_put_wblocks(sb, NULL, 1);
1884 } 1884 }
1885 1885
@@ -2119,14 +2119,14 @@ void logfs_set_segment_unreserved(struct super_block *sb, u32 segno, u32 ec)
2119 ec_level); 2119 ec_level);
2120} 2120}
2121 2121
2122int __logfs_write_inode(struct inode *inode, long flags) 2122int __logfs_write_inode(struct inode *inode, struct page *page, long flags)
2123{ 2123{
2124 struct super_block *sb = inode->i_sb; 2124 struct super_block *sb = inode->i_sb;
2125 int ret; 2125 int ret;
2126 2126
2127 logfs_get_wblocks(sb, NULL, flags & WF_LOCK); 2127 logfs_get_wblocks(sb, page, flags & WF_LOCK);
2128 ret = do_write_inode(inode); 2128 ret = do_write_inode(inode);
2129 logfs_put_wblocks(sb, NULL, flags & WF_LOCK); 2129 logfs_put_wblocks(sb, page, flags & WF_LOCK);
2130 return ret; 2130 return ret;
2131} 2131}
2132 2132