diff options
| author | Josef Bacik <jbacik@fusionio.com> | 2013-09-11 09:55:42 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-09-21 11:05:24 -0400 |
| commit | a5874ce6ce4a3e4fc3db254ccf6d59d8501a56d8 (patch) | |
| tree | b445fd797a1d4a99d67050c7eef9a6235d635da4 /fs | |
| parent | de2b530bfb683fd75c31ab65ec42949f5f7a5b58 (diff) | |
| download | linux-a5874ce6ce4a3e4fc3db254ccf6d59d8501a56d8.tar.gz linux-a5874ce6ce4a3e4fc3db254ccf6d59d8501a56d8.tar.bz2 linux-a5874ce6ce4a3e4fc3db254ccf6d59d8501a56d8.zip | |
Btrfs: check roots last log commit when checking if an inode has been logged
Liu introduced a local copy of the last log commit for an inode to make sure we
actually log an inode even if a log commit has already taken place. In order to
make sure we didn't relog the same inode multiple times he set this local copy
to the current trans when we log the inode, because usually we log the inode and
then sync the log. The exception to this is during rename, we will relog an
inode if the name changed and it is already in the log. The problem with this
is then we go to sync the inode, and our check to see if the inode has already
been logged is tripped and we don't sync the log. To fix this we need to _also_
check against the roots last log commit, because it could be less than what is
in our local copy of the log commit. This fixes a bug where we rename a file
into a directory and then fsync the directory and then on remount the directory
is no longer there. Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/btrfs_inode.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index d0ae226926ee..71f074e1870b 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -213,7 +213,10 @@ static inline bool btrfs_is_free_space_inode(struct inode *inode) static inline int btrfs_inode_in_log(struct inode *inode, u64 generation) { if (BTRFS_I(inode)->logged_trans == generation && - BTRFS_I(inode)->last_sub_trans <= BTRFS_I(inode)->last_log_commit) + BTRFS_I(inode)->last_sub_trans <= + BTRFS_I(inode)->last_log_commit && + BTRFS_I(inode)->last_sub_trans <= + BTRFS_I(inode)->root->last_log_commit) return 1; return 0; } |