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 git://github.com/rustyrussell/linux
[pandora-kernel.git]
/
fs
/
ubifs
/
xattr.c
diff --git
a/fs/ubifs/xattr.c
b/fs/ubifs/xattr.c
index
16f19f5
..
bf18f7a
100644
(file)
--- a/
fs/ubifs/xattr.c
+++ b/
fs/ubifs/xattr.c
@@
-558,10
+558,10
@@
int ubifs_removexattr(struct dentry *dentry, const char *name)
}
ubifs_assert(inode->i_nlink == 1);
-
inode->i_nlink = 0
;
+
clear_nlink(inode)
;
err = remove_xattr(c, host, inode, &nm);
if (err)
-
inode->i_nlink = 1
;
+
set_nlink(inode, 1)
;
/* If @i_nlink is 0, 'iput()' will delete the inode */
iput(inode);