diff --git a/[refs] b/[refs]
index 54c20bd01693..dbc52f62f95d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d66d1f76878fcb1e78592fe8aecd13f438d6c0d7
+refs/heads/master: c1b75eabec4eddce55ebb078f84481f58272878f
diff --git a/trunk/fs/f2fs/acl.c b/trunk/fs/f2fs/acl.c
index e95b94945d5f..137af4255da6 100644
--- a/trunk/fs/f2fs/acl.c
+++ b/trunk/fs/f2fs/acl.c
@@ -191,15 +191,14 @@ struct posix_acl *f2fs_get_acl(struct inode *inode, int type)
 		retval = f2fs_getxattr(inode, name_index, "", value, retval);
 	}
 
-	if (retval < 0) {
-		if (retval == -ENODATA)
-			acl = NULL;
-		else
-			acl = ERR_PTR(retval);
-	} else {
+	if (retval > 0)
 		acl = f2fs_acl_from_disk(value, retval);
-	}
+	else if (retval == -ENODATA)
+		acl = NULL;
+	else
+		acl = ERR_PTR(retval);
 	kfree(value);
+
 	if (!IS_ERR(acl))
 		set_cached_acl(inode, type, acl);