diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /fs/btrfs/file.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index bc5072b2db53..72da4df53c9a 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
| @@ -1859,8 +1859,8 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) | |||
| 1859 | 1859 | ||
| 1860 | ret = btrfs_log_dentry_safe(trans, root, dentry); | 1860 | ret = btrfs_log_dentry_safe(trans, root, dentry); |
| 1861 | if (ret < 0) { | 1861 | if (ret < 0) { |
| 1862 | mutex_unlock(&inode->i_mutex); | 1862 | /* Fallthrough and commit/free transaction. */ |
| 1863 | goto out; | 1863 | ret = 1; |
| 1864 | } | 1864 | } |
| 1865 | 1865 | ||
| 1866 | /* we've logged all the items and now have a consistent | 1866 | /* we've logged all the items and now have a consistent |