diff options
| author |   piaojun <piaojun@huawei.com> | 2018-01-31 16:14:51 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 17:18:35 -0800 |
| commit | c0a1a6d769aedd23c80fc12721cc98b126bec91f (patch) | |
| tree | 01df73ac49cc941df59ad9469a9352bf5cad96dd /fs | |
| parent | ocfs2: try a blocking lock before return AOP_TRUNCATED_PAGE (diff) | |
| download | linux-dev-c0a1a6d769aedd23c80fc12721cc98b126bec91f.tar.xz linux-dev-c0a1a6d769aedd23c80fc12721cc98b126bec91f.zip | |
ocfs2/xattr: assign errno to 'ret' in ocfs2_calc_xattr_init()
We need catch the errno returned by ocfs2_xattr_get_nolock() and assign
it to 'ret' for printing and noticing upper callers.
Link: http://lkml.kernel.org/r/5A571CAF.8050709@huawei.com
Signed-off-by: Jun Piao <piaojun@huawei.com>
Reviewed-by: Alex Chen <alex.chen@huawei.com>
Reviewed-by: Yiwen Jiang <jiangyiwen@huawei.com>
Acked-by: Gang He <ghe@suse.com>
Acked-by: Changwei Ge <ge.changwei@h3c.com>
Cc: Mark Fasheh <mfasheh@versity.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <jiangqi903@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/xattr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index 2423e905ec1a..268619c96b4e 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -646,6 +646,7 @@ int ocfs2_calc_xattr_init(struct inode *dir, if (S_ISDIR(mode)) a_size <<= 1; } else if (acl_len != 0 && acl_len != -ENODATA) { + ret = acl_len; mlog_errno(ret); return ret; } |