From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 11 Aug 2010 07:36:51 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Tag: firefly_0821_release~7613^2~3662^2~34
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6396fc3b3ff3f6b942992b653a62df11dcef9bea;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' into for-next

Conflicts:
	fs/exofs/inode.c
---

6396fc3b3ff3f6b942992b653a62df11dcef9bea
diff --cc fs/exofs/inode.c
index 5862ae87ed29,088cb476b68a..185ef1281e0c
--- a/fs/exofs/inode.c
+++ b/fs/exofs/inode.c
@@@ -709,8 -716,8 +716,8 @@@ int exofs_write_begin(struct file *file
  		ret = simple_write_begin(file, mapping, pos, len, flags, pagep,
  					 fsdata);
  		if (ret) {
 -			EXOFS_DBGMSG("simple_write_begin faild\n");
 +			EXOFS_DBGMSG("simple_write_begin failed\n");
- 			return ret;
+ 			goto out;
  		}
  
  		page = *pagep;
@@@ -722,9 -729,12 +729,12 @@@
  		if (ret) {
  			/*SetPageError was done by _readpage. Is it ok?*/
  			unlock_page(page);
 -			EXOFS_DBGMSG("__readpage_filler faild\n");
 +			EXOFS_DBGMSG("__readpage_filler failed\n");
  		}
  	}
+ out:
+ 	if (unlikely(ret))
+ 		_write_failed(mapping->host, pos + len);
  
  	return ret;
  }