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

Commit 28fd1298 authored by OGAWA Hirofumi's avatar OGAWA Hirofumi Committed by Linus Torvalds
Browse files

[PATCH] Fix and add EXPORT_SYMBOL(filemap_write_and_wait) 



This patch add EXPORT_SYMBOL(filemap_write_and_wait) and use it.

See mm/filemap.c:

And changes the filemap_write_and_wait() and filemap_write_and_wait_range().

Current filemap_write_and_wait() doesn't wait if filemap_fdatawrite()
returns error.  However, even if filemap_fdatawrite() returned an
error, it may have submitted the partially data pages to the device.
(e.g. in the case of -ENOSPC)

<quotation>
Andrew Morton writes,

If filemap_fdatawrite() returns an error, this might be due to some
I/O problem: dead disk, unplugged cable, etc.  Given the generally
crappy quality of the kernel's handling of such exceptions, there's a
good chance that the filemap_fdatawait() will get stuck in D state
forever.
</quotation>

So, this patch doesn't wait if filemap_fdatawrite() returns the -EIO.

Trond, could you please review the nfs part?  Especially I'm not sure,
nfs must use the "filemap_fdatawrite(inode->i_mapping) == 0", or not.

Acked-by: default avatarTrond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 05eb0b51

fs/9p/vfs_dir.c

+1 −2
Original line number Diff line number Diff line
@@ -193,8 +193,7 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) 
		fid->fid);

	fidnum = fid->fid;



	filemap_fdatawrite(inode->i_mapping);

	filemap_fdatawait(inode->i_mapping);

	filemap_write_and_wait(inode->i_mapping);



	if (fidnum >= 0) {

		dprintk(DEBUG_VFS, "fidopen: %d v9f->fid: %d\n", fid->fidopen,

fs/9p/vfs_file.c

+1 −2
Original line number Diff line number Diff line
@@ -165,8 +165,7 @@ static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl) 
		return -ENOLCK;



	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) {

		filemap_fdatawrite(inode->i_mapping);

		filemap_fdatawait(inode->i_mapping);

		filemap_write_and_wait(inode->i_mapping);

		invalidate_inode_pages(&inode->i_data);

	}

fs/buffer.c

+2 −8
Original line number Diff line number Diff line
@@ -153,14 +153,8 @@ int sync_blockdev(struct block_device *bdev) 
{

	int ret = 0;



	if (bdev) {

		int err;



		ret = filemap_fdatawrite(bdev->bd_inode->i_mapping);

		err = filemap_fdatawait(bdev->bd_inode->i_mapping);

		if (!ret)

			ret = err;

	}

	if (bdev)

		ret = filemap_write_and_wait(bdev->bd_inode->i_mapping);

	return ret;

}

EXPORT_SYMBOL(sync_blockdev);

fs/cifs/file.c

+2 −4
Original line number Diff line number Diff line
@@ -127,8 +127,7 @@ static inline int cifs_open_inode_helper(struct inode *inode, struct file *file, 
		if (file->f_dentry->d_inode->i_mapping) {

		/* BB no need to lock inode until after invalidate

		   since namei code should already have it locked? */

			filemap_fdatawrite(file->f_dentry->d_inode->i_mapping);

			filemap_fdatawait(file->f_dentry->d_inode->i_mapping);

			filemap_write_and_wait(file->f_dentry->d_inode->i_mapping);

		}

		cFYI(1, ("invalidating remote inode since open detected it "

			 "changed"));
@@ -419,8 +418,7 @@ static int cifs_reopen_file(struct inode *inode, struct file *file, 
		pCifsInode = CIFS_I(inode);

		if (pCifsInode) {

			if (can_flush) {

				filemap_fdatawrite(inode->i_mapping);

				filemap_fdatawait(inode->i_mapping);

				filemap_write_and_wait(inode->i_mapping);

			/* temporarily disable caching while we

			   go to server to get inode info */

				pCifsInode->clientCanCacheAll = FALSE;

fs/cifs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -1148,8 +1148,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) 
	/* BB check if we need to refresh inode from server now ? BB */



	/* need to flush data before changing file size on server */

	filemap_fdatawrite(direntry->d_inode->i_mapping);

	filemap_fdatawait(direntry->d_inode->i_mapping);

	filemap_write_and_wait(direntry->d_inode->i_mapping);



	if (attrs->ia_valid & ATTR_SIZE) {

		/* To avoid spurious oplock breaks from server, in the case of