ext4: Assure that metadata blocks are written during fsync in no journal mode
authorTheodore Ts'o <tytso@mit.edu>
Sat, 12 Sep 2009 17:41:55 +0000 (13:41 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sat, 12 Sep 2009 17:41:55 +0000 (13:41 -0400)
When there is no journal present, we must attach buffer heads
associated with extent tree and indirect blocks to the inode's
mapping->private_list via mark_buffer_dirty_inode() so that
ext4_sync_file() --- which is called to service fsync() and
fdatasync() system calls --- can write out the inode's metadata blocks
by calling sync_mapping_buffers().

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
fs/ext4/ext4_jbd2.c
fs/ext4/fsync.c

index ecb9ca455fd5d901a2cce418858eae2310c66fe5..6a9409920deef2f6040b8d7279114cfc0612221d 100644 (file)
@@ -89,7 +89,10 @@ int __ext4_handle_dirty_metadata(const char *where, handle_t *handle,
                        ext4_journal_abort_handle(where, __func__, bh,
                                                  handle, err);
        } else {
-               mark_buffer_dirty(bh);
+               if (inode && bh)
+                       mark_buffer_dirty_inode(bh, inode);
+               else
+                       mark_buffer_dirty(bh);
                if (inode && inode_needs_sync(inode)) {
                        sync_dirty_buffer(bh);
                        if (buffer_req(bh) && !buffer_uptodate(bh)) {
index ab418c0f502d59c1a8902f8992319ca11f5ab055..07475740b512535ec6d30aa3b36d6892b765e839 100644 (file)
@@ -50,7 +50,7 @@ int ext4_sync_file(struct file *file, struct dentry *dentry, int datasync)
 {
        struct inode *inode = dentry->d_inode;
        journal_t *journal = EXT4_SB(inode->i_sb)->s_journal;
-       int ret = 0;
+       int err, ret = 0;
 
        J_ASSERT(ext4_journal_current_handle() == NULL);
 
@@ -79,6 +79,9 @@ int ext4_sync_file(struct file *file, struct dentry *dentry, int datasync)
                goto out;
        }
 
+       if (!journal)
+               ret = sync_mapping_buffers(inode->i_mapping);
+
        if (datasync && !(inode->i_state & I_DIRTY_DATASYNC))
                goto out;
 
@@ -91,7 +94,9 @@ int ext4_sync_file(struct file *file, struct dentry *dentry, int datasync)
                        .sync_mode = WB_SYNC_ALL,
                        .nr_to_write = 0, /* sys_fsync did this */
                };
-               ret = sync_inode(inode, &wbc);
+               err = sync_inode(inode, &wbc);
+               if (ret == 0)
+                       ret = err;
        }
 out:
        if (journal && (journal->j_flags & JBD2_BARRIER))