diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
| commit | fced6dee29f6fb143fe16ea90331176ff77e6120 (patch) | |
| tree | 5b6e57e7a757adc2a6518ce291a4d2914397b917 /fs/btrfs/ioctl.c | |
| parent | bfed1074f213051e94648bfad0d0611a16d81366 (diff) | |
| parent | be1f7c8d7e2bc8b8c76846aa6f276e8d2ef8975a (diff) | |
Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index e79ff6b90cb7..2ad7de94efef 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
| @@ -3066,7 +3066,7 @@ process_slot: | |||
| 3066 | new_key.offset + datal, | 3066 | new_key.offset + datal, |
| 3067 | 1); | 3067 | 1); |
| 3068 | if (ret) { | 3068 | if (ret) { |
| 3069 | if (ret != -EINVAL) | 3069 | if (ret != -EOPNOTSUPP) |
| 3070 | btrfs_abort_transaction(trans, | 3070 | btrfs_abort_transaction(trans, |
| 3071 | root, ret); | 3071 | root, ret); |
| 3072 | btrfs_end_transaction(trans, root); | 3072 | btrfs_end_transaction(trans, root); |
| @@ -3141,7 +3141,7 @@ process_slot: | |||
| 3141 | new_key.offset + datal, | 3141 | new_key.offset + datal, |
| 3142 | 1); | 3142 | 1); |
| 3143 | if (ret) { | 3143 | if (ret) { |
| 3144 | if (ret != -EINVAL) | 3144 | if (ret != -EOPNOTSUPP) |
| 3145 | btrfs_abort_transaction(trans, | 3145 | btrfs_abort_transaction(trans, |
| 3146 | root, ret); | 3146 | root, ret); |
| 3147 | btrfs_end_transaction(trans, root); | 3147 | btrfs_end_transaction(trans, root); |