diff options
| author | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:33 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:33 +0100 |
| commit | f004fae0cfeb96d33240eb5471f14cb6fbbd4eea (patch) | |
| tree | 8a0cc3be4e031298ef1f6db573c5f57da333737e /fs/btrfs/file.c | |
| parent | 675d276b322b45e7bf7c616a2847bdc425745b99 (diff) | |
| parent | f827ba9a641b481f01d1bdc0771a7afc3776cc0b (diff) | |
| download | op-kernel-dev-f004fae0cfeb96d33240eb5471f14cb6fbbd4eea.zip op-kernel-dev-f004fae0cfeb96d33240eb5471f14cb6fbbd4eea.tar.gz | |
Merge branch 'cleanups-4.6' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 2d9e400..4ab4b5c 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2569,7 +2569,7 @@ out_trans: goto out_free; inode_inc_iversion(inode); - inode->i_mtime = inode->i_ctime = CURRENT_TIME; + inode->i_mtime = inode->i_ctime = current_fs_time(inode->i_sb); trans->block_rsv = &root->fs_info->trans_block_rsv; ret = btrfs_update_inode(trans, root, inode); @@ -2819,7 +2819,7 @@ static long btrfs_fallocate(struct file *file, int mode, if (IS_ERR(trans)) { ret = PTR_ERR(trans); } else { - inode->i_ctime = CURRENT_TIME; + inode->i_ctime = current_fs_time(inode->i_sb); i_size_write(inode, actual_end); btrfs_ordered_update_i_size(inode, actual_end, NULL); ret = btrfs_update_inode(trans, root, inode); @@ -2964,8 +2964,7 @@ const struct file_operations btrfs_file_operations = { void btrfs_auto_defrag_exit(void) { - if (btrfs_inode_defrag_cachep) - kmem_cache_destroy(btrfs_inode_defrag_cachep); + kmem_cache_destroy(btrfs_inode_defrag_cachep); } int btrfs_auto_defrag_init(void) |
