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

Commit 2d1b399b authored by Marco Stornelli's avatar Marco Stornelli Committed by Al Viro
Browse files

nilfs2: drop vmtruncate 



Removed vmtruncate

Signed-off-by: default avatarMarco Stornelli <marco.stornelli@gmail.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3e7a8069

fs/nilfs2/file.c

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ const struct file_operations nilfs_file_operations = { 
};



const struct inode_operations nilfs_file_inode_operations = {

	.truncate	= nilfs_truncate,

	.setattr	= nilfs_setattr,

	.permission     = nilfs_permission,

	.fiemap		= nilfs_fiemap,

fs/nilfs2/inode.c

+15 −9
Original line number Diff line number Diff line
@@ -213,6 +213,16 @@ static int nilfs_set_page_dirty(struct page *page) 
	return ret;

}



void nilfs_write_failed(struct address_space *mapping, loff_t to)

{

	struct inode *inode = mapping->host;



	if (to > inode->i_size) {

		truncate_pagecache(inode, to, inode->i_size);

		nilfs_truncate(inode);

	}

}



static int nilfs_write_begin(struct file *file, struct address_space *mapping,

			     loff_t pos, unsigned len, unsigned flags,

			     struct page **pagep, void **fsdata)
@@ -227,10 +237,7 @@ static int nilfs_write_begin(struct file *file, struct address_space *mapping, 
	err = block_write_begin(mapping, pos, len, flags, pagep,

				nilfs_get_block);

	if (unlikely(err)) {

		loff_t isize = mapping->host->i_size;

		if (pos + len > isize)

			vmtruncate(mapping->host, isize);



		nilfs_write_failed(mapping, pos + len);

		nilfs_transaction_abort(inode->i_sb);

	}

	return err;
@@ -259,6 +266,7 @@ nilfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, 
		loff_t offset, unsigned long nr_segs)

{

	struct file *file = iocb->ki_filp;

	struct address_space *mapping = file->f_mapping;

	struct inode *inode = file->f_mapping->host;

	ssize_t size;
@@ -278,7 +286,7 @@ nilfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, 
		loff_t end = offset + iov_length(iov, nr_segs);



		if (end > isize)

			vmtruncate(inode, isize);

			nilfs_write_failed(mapping, end);

	}



	return size;
@@ -786,10 +794,8 @@ int nilfs_setattr(struct dentry *dentry, struct iattr *iattr) 
	if ((iattr->ia_valid & ATTR_SIZE) &&

	    iattr->ia_size != i_size_read(inode)) {

		inode_dio_wait(inode);



		err = vmtruncate(inode, iattr->ia_size);

		if (unlikely(err))

			goto out_err;

		truncate_setsize(inode, iattr->ia_size);

		nilfs_truncate(inode);

	}



	setattr_copy(inode, iattr);

fs/nilfs2/nilfs.h

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ extern void nilfs_update_inode(struct inode *, struct buffer_head *); 
extern void nilfs_truncate(struct inode *);

extern void nilfs_evict_inode(struct inode *);

extern int nilfs_setattr(struct dentry *, struct iattr *);

extern void nilfs_write_failed(struct address_space *mapping, loff_t to);

int nilfs_permission(struct inode *inode, int mask);

int nilfs_load_inode_block(struct inode *inode, struct buffer_head **pbh);

extern int nilfs_inode_dirty(struct inode *);

fs/nilfs2/recovery.c

+2 −1
Original line number Diff line number Diff line
@@ -527,7 +527,8 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs, 
		if (unlikely(err)) {

			loff_t isize = inode->i_size;

			if (pos + blocksize > isize)

				vmtruncate(inode, isize);

				nilfs_write_failed(inode->i_mapping,

							pos + blocksize);

			goto failed_inode;

		}