projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix phy_read/write redefinition errors in ucc_geth_phy.c
[powerpc.git]
/
fs
/
jffs2
/
acl.c
diff --git
a/fs/jffs2/acl.c
b/fs/jffs2/acl.c
index
320dd48
..
73f0d60
100644
(file)
--- a/
fs/jffs2/acl.c
+++ b/
fs/jffs2/acl.c
@@
-11,6
+11,7
@@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/fs.h>
+#include <linux/sched.h>
#include <linux/time.h>
#include <linux/crc32.h>
#include <linux/jffs2.h>
#include <linux/time.h>
#include <linux/crc32.h>
#include <linux/jffs2.h>
@@
-267,6
+268,8
@@
static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
}
rc = do_jffs2_setxattr(inode, xprefix, "", value, size, 0);
}
rc = do_jffs2_setxattr(inode, xprefix, "", value, size, 0);
+ if (!value && rc == -ENODATA)
+ rc = 0;
if (value)
kfree(value);
if (!rc) {
if (value)
kfree(value);
if (!rc) {
@@
-343,10
+346,8
@@
int jffs2_init_acl(struct inode *inode, struct inode *dir)
return rc;
}
return rc;
}
-void jffs2_clear_acl(struct
inode *inode
)
+void jffs2_clear_acl(struct
jffs2_inode_info *f
)
{
{
- struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
-
if (f->i_acl_access && f->i_acl_access != JFFS2_ACL_NOT_CACHED) {
posix_acl_release(f->i_acl_access);
f->i_acl_access = JFFS2_ACL_NOT_CACHED;
if (f->i_acl_access && f->i_acl_access != JFFS2_ACL_NOT_CACHED) {
posix_acl_release(f->i_acl_access);
f->i_acl_access = JFFS2_ACL_NOT_CACHED;