git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://www.jni.nu/cris
[pandora-kernel.git]
/
fs
/
ubifs
/
xattr.c
diff --git
a/fs/ubifs/xattr.c
b/fs/ubifs/xattr.c
index
649bec7
..
cfd31e2
100644
(file)
--- a/
fs/ubifs/xattr.c
+++ b/
fs/ubifs/xattr.c
@@
-446,7
+446,7
@@
ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size)
int type;
xent = ubifs_tnc_next_ent(c, &key, &nm);
- if (
unlikely(IS_ERR(xent)
)) {
+ if (
IS_ERR(xent
)) {
err = PTR_ERR(xent);
break;
}