diff options
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 5c4ab9c18940..d3d44486290b 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -2629,7 +2629,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)  			EXTENT_DEFRAG, 1, cached_state);  	if (ret) {  		u64 last_snapshot = btrfs_root_last_snapshot(&root->root_item); -		if (last_snapshot >= BTRFS_I(inode)->generation) +		if (0 && last_snapshot >= BTRFS_I(inode)->generation)  			/* the inode is shared */  			new = record_old_file_extents(inode, ordered_extent); @@ -5154,7 +5154,7 @@ static struct dentry *btrfs_lookup(struct inode *dir, struct dentry *dentry,  			return ERR_CAST(inode);  	} -	return d_splice_alias(inode, dentry); +	return d_materialise_unique(dentry, inode);  }  unsigned char btrfs_filetype_table[] = { |