Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e41f941a authored by Josef Bacik's avatar Josef Bacik Committed by Al Viro
Browse files

Btrfs: move over to use ->update_time 



Btrfs had been doing it's own file_update_time so we could catch ENOSPC
properly, so just update our btrfs_update_time to work with the new stuff and
then we'll be fancy later.  Thanks,

Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
parent c3b2da31

fs/btrfs/ctree.h

+0 −1
Original line number Diff line number Diff line
@@ -2922,7 +2922,6 @@ int btrfs_readpage(struct file *file, struct page *page); 
void btrfs_evict_inode(struct inode *inode);

int btrfs_write_inode(struct inode *inode, struct writeback_control *wbc);

int btrfs_dirty_inode(struct inode *inode);

int btrfs_update_time(struct file *file);

struct inode *btrfs_alloc_inode(struct super_block *sb);

void btrfs_destroy_inode(struct inode *inode);

int btrfs_drop_inode(struct inode *inode);

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb, 
		goto out;

	}



	err = btrfs_update_time(file);

	err = file_update_time(file);

	if (err) {

		mutex_unlock(&inode->i_mutex);

		goto out;

fs/btrfs/inode.c

+14 −39
Original line number Diff line number Diff line
@@ -4431,46 +4431,18 @@ int btrfs_dirty_inode(struct inode *inode) 
 * This is a copy of file_update_time.  We need this so we can return error on

 * ENOSPC for updating the inode in the case of file write and mmap writes.

 */

int btrfs_update_time(struct file *file)

static int btrfs_update_time(struct inode *inode, struct timespec *now,

			     int flags)

{

	struct inode *inode = file->f_path.dentry->d_inode;

	struct timespec now;

	int ret;

	enum { S_MTIME = 1, S_CTIME = 2, S_VERSION = 4 } sync_it = 0;



	/* First try to exhaust all avenues to not sync */

	if (IS_NOCMTIME(inode))

		return 0;



	now = current_fs_time(inode->i_sb);

	if (!timespec_equal(&inode->i_mtime, &now))

		sync_it = S_MTIME;



	if (!timespec_equal(&inode->i_ctime, &now))

		sync_it |= S_CTIME;



	if (IS_I_VERSION(inode))

		sync_it |= S_VERSION;



	if (!sync_it)

		return 0;



	/* Finally allowed to write? Takes lock. */

	if (mnt_want_write_file(file))

		return 0;



	/* Only change inode inside the lock region */

	if (sync_it & S_VERSION)

	if (flags & S_VERSION)

		inode_inc_iversion(inode);

	if (sync_it & S_CTIME)

		inode->i_ctime = now;

	if (sync_it & S_MTIME)

		inode->i_mtime = now;

	ret = btrfs_dirty_inode(inode);

	if (!ret)

		mark_inode_dirty_sync(inode);

	mnt_drop_write(file->f_path.mnt);

	return ret;

	if (flags & S_CTIME)

		inode->i_ctime = *now;

	if (flags & S_MTIME)

		inode->i_mtime = *now;

	if (flags & S_ATIME)

		inode->i_atime = *now;

	return btrfs_dirty_inode(inode);

}



/*
@@ -6576,7 +6548,7 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 


	ret  = btrfs_delalloc_reserve_space(inode, PAGE_CACHE_SIZE);

	if (!ret) {

		ret = btrfs_update_time(vma->vm_file);

		ret = file_update_time(vma->vm_file);

		reserved = 1;

	}

	if (ret) {
@@ -7647,6 +7619,7 @@ static const struct inode_operations btrfs_file_inode_operations = { 
	.permission	= btrfs_permission,

	.fiemap		= btrfs_fiemap,

	.get_acl	= btrfs_get_acl,

	.update_time	= btrfs_update_time,

};

static const struct inode_operations btrfs_special_inode_operations = {

	.getattr	= btrfs_getattr,
@@ -7657,6 +7630,7 @@ static const struct inode_operations btrfs_special_inode_operations = { 
	.listxattr	= btrfs_listxattr,

	.removexattr	= btrfs_removexattr,

	.get_acl	= btrfs_get_acl,

	.update_time	= btrfs_update_time,

};

static const struct inode_operations btrfs_symlink_inode_operations = {

	.readlink	= generic_readlink,
@@ -7670,6 +7644,7 @@ static const struct inode_operations btrfs_symlink_inode_operations = { 
	.listxattr	= btrfs_listxattr,

	.removexattr	= btrfs_removexattr,

	.get_acl	= btrfs_get_acl,

	.update_time	= btrfs_update_time,

};



const struct dentry_operations btrfs_dentry_operations = {