diff options
author | Frank Mayhar <fmayhar@google.com> | 2010-05-17 08:00:00 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2010-05-17 08:00:00 -0400 |
commit | 14ece1028b3ed53ffec1b1213ffc6acaf79ad77c (patch) | |
tree | 8f5a13487139c68ef775c9d39b7be83386fdae06 /fs | |
parent | 60e6679e28518ccd67169c4a539d8cc7490eb8a6 (diff) |
ext4: Make fsync sync new parent directories in no-journal mode
Add a new ext4 state to tell us when a file has been newly created; use
that state in ext4_sync_file in no-journal mode to tell us when we need
to sync the parent directory as well as the inode and data itself. This
fixes a problem in which a panic or power failure may lose the entire
file even when using fsync, since the parent directory entry is lost.
Addresses-Google-Bug: #2480057
Signed-off-by: Frank Mayhar <fmayhar@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/ext4.h | 1 | ||||
-rw-r--r-- | fs/ext4/fsync.c | 31 | ||||
-rw-r--r-- | fs/ext4/namei.c | 2 |
3 files changed, 32 insertions, 2 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 124ef771a618..60bd31026e7c 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -1180,6 +1180,7 @@ enum { | |||
1180 | EXT4_STATE_DA_ALLOC_CLOSE, /* Alloc DA blks on close */ | 1180 | EXT4_STATE_DA_ALLOC_CLOSE, /* Alloc DA blks on close */ |
1181 | EXT4_STATE_EXT_MIGRATE, /* Inode is migrating */ | 1181 | EXT4_STATE_EXT_MIGRATE, /* Inode is migrating */ |
1182 | EXT4_STATE_DIO_UNWRITTEN, /* need convert on dio done*/ | 1182 | EXT4_STATE_DIO_UNWRITTEN, /* need convert on dio done*/ |
1183 | EXT4_STATE_NEWENTRY, /* File just added to dir */ | ||
1183 | }; | 1184 | }; |
1184 | 1185 | ||
1185 | #define EXT4_INODE_BIT_FNS(name, field) \ | 1186 | #define EXT4_INODE_BIT_FNS(name, field) \ |
diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c index 6ca7b6e59d83..e187f87acec0 100644 --- a/fs/ext4/fsync.c +++ b/fs/ext4/fsync.c | |||
@@ -35,6 +35,29 @@ | |||
35 | #include <trace/events/ext4.h> | 35 | #include <trace/events/ext4.h> |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * If we're not journaling and this is a just-created file, we have to | ||
39 | * sync our parent directory (if it was freshly created) since | ||
40 | * otherwise it will only be written by writeback, leaving a huge | ||
41 | * window during which a crash may lose the file. This may apply for | ||
42 | * the parent directory's parent as well, and so on recursively, if | ||
43 | * they are also freshly created. | ||
44 | */ | ||
45 | static void ext4_sync_parent(struct inode *inode) | ||
46 | { | ||
47 | struct dentry *dentry = NULL; | ||
48 | |||
49 | while (inode && ext4_test_inode_state(inode, EXT4_STATE_NEWENTRY)) { | ||
50 | ext4_clear_inode_state(inode, EXT4_STATE_NEWENTRY); | ||
51 | dentry = list_entry(inode->i_dentry.next, | ||
52 | struct dentry, d_alias); | ||
53 | if (!dentry || !dentry->d_parent || !dentry->d_parent->d_inode) | ||
54 | break; | ||
55 | inode = dentry->d_parent->d_inode; | ||
56 | sync_mapping_buffers(inode->i_mapping); | ||
57 | } | ||
58 | } | ||
59 | |||
60 | /* | ||
38 | * akpm: A new design for ext4_sync_file(). | 61 | * akpm: A new design for ext4_sync_file(). |
39 | * | 62 | * |
40 | * This is only called from sys_fsync(), sys_fdatasync() and sys_msync(). | 63 | * This is only called from sys_fsync(), sys_fdatasync() and sys_msync(). |
@@ -67,8 +90,12 @@ int ext4_sync_file(struct file *file, struct dentry *dentry, int datasync) | |||
67 | if (ret < 0) | 90 | if (ret < 0) |
68 | return ret; | 91 | return ret; |
69 | 92 | ||
70 | if (!journal) | 93 | if (!journal) { |
71 | return simple_fsync(file, dentry, datasync); | 94 | ret = simple_fsync(file, dentry, datasync); |
95 | if (!ret && !list_empty(&inode->i_dentry)) | ||
96 | ext4_sync_parent(inode); | ||
97 | return ret; | ||
98 | } | ||
72 | 99 | ||
73 | /* | 100 | /* |
74 | * data=writeback,ordered: | 101 | * data=writeback,ordered: |
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 83be743c8d1f..a43e6617b351 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c | |||
@@ -1517,6 +1517,8 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry, | |||
1517 | de->rec_len = ext4_rec_len_to_disk(blocksize, blocksize); | 1517 | de->rec_len = ext4_rec_len_to_disk(blocksize, blocksize); |
1518 | retval = add_dirent_to_buf(handle, dentry, inode, de, bh); | 1518 | retval = add_dirent_to_buf(handle, dentry, inode, de, bh); |
1519 | brelse(bh); | 1519 | brelse(bh); |
1520 | if (retval == 0) | ||
1521 | ext4_set_inode_state(inode, EXT4_STATE_NEWENTRY); | ||
1520 | return retval; | 1522 | return retval; |
1521 | } | 1523 | } |
1522 | 1524 | ||