aboutsummaryrefslogtreecommitdiff
path: root/fs/ext4/inline.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-01-19 12:04:27 +0800
committerAlex Shi <alex.shi@linaro.org>2017-01-19 12:04:27 +0800
commitcb370744bc101be91a0bc3e9fbdb670ab44df97d (patch)
tree1a84448b43dee0f4e255f9434e776c51812ddb35 /fs/ext4/inline.c
parent67f07b48af22065412ba4e78472121c0a9f58329 (diff)
parentf40b3cc69de8c97bbcdb74e3cffda06ffcad2cd7 (diff)
Merge tag 'v4.1.38' into linux-linaro-lsk-v4.1lsk-v4.1-17.02
This is the 4.1.38 stable release
Diffstat (limited to 'fs/ext4/inline.c')
-rw-r--r--fs/ext4/inline.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 095c7a258d97..d77d542c2ed5 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -336,8 +336,10 @@ static int ext4_update_inline_data(handle_t *handle, struct inode *inode,
len -= EXT4_MIN_INLINE_DATA_SIZE;
value = kzalloc(len, GFP_NOFS);
- if (!value)
+ if (!value) {
+ error = -ENOMEM;
goto out;
+ }
error = ext4_xattr_ibody_get(inode, i.name_index, i.name,
value, len);