summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoxiLiu <lewis.liulei@huawei.com>2013-10-30 13:07:20 +0100
committerTheodore Ts'o <tytso@mit.edu>2013-10-30 13:07:20 +0100
commit48ffdab1c1eb87fee9ed7366472e2b9aa4577a60 (patch)
tree1c456821dd2e21f429d4a9c2b3ba8f17cb1720bf
parentext4: pair trace_ext4_writepages & trace_ext4_writepages_result (diff)
downloadlinux-48ffdab1c1eb87fee9ed7366472e2b9aa4577a60.tar.xz
linux-48ffdab1c1eb87fee9ed7366472e2b9aa4577a60.zip
ext4: change ext4_read_inline_dir() to return 0 on success
In ext4_read_inline_dir(), if there is inline data, the successful return value is the return value of ext4_read_inline_data(). Howewer, this is used by ext4_readdir(), and while it seems harmless to return a positive value on success, it's inconsistent, since historically we've always return 0 on success. Signed-off-by: BoxiLiu <lewis.liulei@huawei.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Acked-by: Tao Ma <boyu.mt@taobao.com>
-rw-r--r--fs/ext4/inline.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index d9ecbf1113a7..c3efb65d2ec6 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1442,6 +1442,7 @@ int ext4_read_inline_dir(struct file *file,
if (ret < 0)
goto out;
+ ret = 0;
sb = inode->i_sb;
parent_ino = le32_to_cpu(((struct ext4_dir_entry_2 *)dir_buf)->inode);
offset = ctx->pos;