cfc8dc6f6f
[In commit 9ed437c50d we fixed a problem
with standard permissions on newly-created inodes, when POSIX ACLs are
enabled. This cleans it up...]
The attached patch separate jffs2_init_acl() into two parts.
The one is jffs2_init_acl_pre() called from jffs2_new_inode().
It compute ACL oriented inode->i_mode bits, and allocate in-memory ACL
objects associated with the new inode just before when inode meta
infomation is written to the medium.
The other is jffs2_init_acl_post() called from jffs2_symlink(),
jffs2_mkdir(), jffs2_mknod() and jffs2_do_create().
It actually writes in-memory ACL objects into the medium next to
the success of writing meta-information.
In the current implementation, we have to write a same inode meta
infomation twice when inode->i_mode is updated by the default ACL.
However, we can avoid the behavior by putting an updated i_mode
before it is written at first, as jffs2_init_acl_pre() doing.
Signed-off-by: KaiGai Kohei <kaigai@ak.jp.nec.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
50 lines
1.2 KiB
C
50 lines
1.2 KiB
C
/*
|
|
* JFFS2 -- Journalling Flash File System, Version 2.
|
|
*
|
|
* Copyright © 2006 NEC Corporation
|
|
*
|
|
* Created by KaiGai Kohei <kaigai@ak.jp.nec.com>
|
|
*
|
|
* For licensing information, see the file 'LICENCE' in this directory.
|
|
*
|
|
*/
|
|
|
|
struct jffs2_acl_entry {
|
|
jint16_t e_tag;
|
|
jint16_t e_perm;
|
|
jint32_t e_id;
|
|
};
|
|
|
|
struct jffs2_acl_entry_short {
|
|
jint16_t e_tag;
|
|
jint16_t e_perm;
|
|
};
|
|
|
|
struct jffs2_acl_header {
|
|
jint32_t a_version;
|
|
};
|
|
|
|
#ifdef CONFIG_JFFS2_FS_POSIX_ACL
|
|
|
|
#define JFFS2_ACL_NOT_CACHED ((void *)-1)
|
|
|
|
extern struct posix_acl *jffs2_get_acl(struct inode *inode, int type);
|
|
extern int jffs2_permission(struct inode *, int, struct nameidata *);
|
|
extern int jffs2_acl_chmod(struct inode *);
|
|
extern int jffs2_init_acl_pre(struct inode *, struct inode *, int *);
|
|
extern int jffs2_init_acl_post(struct inode *);
|
|
extern void jffs2_clear_acl(struct jffs2_inode_info *);
|
|
|
|
extern struct xattr_handler jffs2_acl_access_xattr_handler;
|
|
extern struct xattr_handler jffs2_acl_default_xattr_handler;
|
|
|
|
#else
|
|
|
|
#define jffs2_get_acl(inode, type) (NULL)
|
|
#define jffs2_permission (NULL)
|
|
#define jffs2_acl_chmod(inode) (0)
|
|
#define jffs2_init_acl_pre(dir_i,inode,mode) (0)
|
|
#define jffs2_init_acl_post(inode) (0)
|
|
#define jffs2_clear_acl(f)
|
|
|
|
#endif /* CONFIG_JFFS2_FS_POSIX_ACL */
|