ocfs2/xattr: assign errno to 'ret' in ocfs2_calc_xattr_init()

[sfrench/cifs-2.6.git] / fs / ocfs2 / xattr.c

diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 2423e905ec1a60e05888e3d37a5ca3fee128c6ad..268619c96b4e02da3e9e1b5147adb69f8b0a4c79 100644 (file)
--- 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;
                }