reiser4: support user namespaces and kuid_t/kgid_t.
PATCH 1/1 reiser4: support user namespaces and kuid_t/kgid_t.
This is required to compile reiser4 with user namespaces support enabled.
--- fs/reiser4/plugin/file_plugin_common.c | 4 ++-- fs/reiser4/plugin/inode_ops.c | 5 ++--- fs/reiser4/plugin/item/static_stat.c | 12 ++++++------ fs/reiser4/super.h | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-)
fs/reiser4/plugin/file_plugin_common.c +2 -2
@@ -61,7 +61,7 @@ int set_plug_in_inode_common(struct inode *object /* inode to set plugin on */ , object->i_mode = data->mode;/* this should be plugin decision */ - object->i_uid = current->cred->fsuid; + object->i_uid =current_fsuid (); object->i_mtime = object->i_atime = object->i_ctime =CURRENT_TIME ;/* support for BSD style group-id assignment. See mount's manual page
@@ -75,7 +75,7 @@ int set_plug_in_inode_common(struct inode *object /* inode to set plugin on */ ,/* sguid is inherited by sub-directories */ object->i_mode |=S_ISGID ; }else - object->i_gid = current->cred->fsgid; + object->i_gid =current_fsgid ();/* this object doesn't have stat-data yet */ reiser4_inode_set_flag (object,REISER4_NO_SD );
fs/reiser4/plugin/inode_ops.c +2 -3
@@ -462,9 +462,8 @@ int reiser4_setattr_common(struct dentry *dentry, struct iattr *attr)*/ result =setattr_reserve (reiser4_tree_by_inode (inode));if (!result) { -if ((attr->ia_valid &ATTR_UID && attr->ia_uid != inode->i_uid) - || (attr->ia_valid &ATTR_GID - && attr->ia_gid != inode->i_gid)) { +if (((attr->ia_valid &ATTR_UID ) && !uid_eq (attr->ia_uid, inode->i_uid)) + || ((attr->ia_valid &ATTR_GID ) && !gid_eq (attr->ia_gid, inode->i_gid))) { result =dquot_transfer (inode, attr) ? -EDQUOT :0 ;if (result) {context_set_commit_async (ctx);
fs/reiser4/plugin/item/static_stat.c +6 -6
@@ -327,8 +327,8 @@ static int present_unix_sd(struct inode *inode /* object being processed */ , sd = (reiser4_unix_stat *) * area; - inode->i_uid =le32_to_cpu (get_unaligned (&sd->uid)); - inode->i_gid =le32_to_cpu (get_unaligned (&sd->gid)); +i_uid_write (inode,le32_to_cpu (get_unaligned (&sd->uid))); +i_gid_write (inode,le32_to_cpu (get_unaligned (&sd->gid))); inode->i_atime.tv_sec =le32_to_cpu (get_unaligned (&sd->atime)); inode->i_mtime.tv_sec =le32_to_cpu (get_unaligned (&sd->mtime)); inode->i_ctime.tv_sec =le32_to_cpu (get_unaligned (&sd->ctime));
@@ -344,8 +344,8 @@ static int present_unix_sd(struct inode *inode /* object being processed */ ,static int absent_unix_sd (struct inode *inode/* object being processed */ ) { - inode->i_uid =get_super_private (inode->i_sb)->default_uid; - inode->i_gid =get_super_private (inode->i_sb)->default_gid; +i_uid_write (inode,get_super_private (inode->i_sb)->default_uid); +i_gid_write (inode,get_super_private (inode->i_sb)->default_gid); inode->i_atime = inode->i_mtime = inode->i_ctime =CURRENT_TIME ;inode_set_bytes (inode, inode->i_size);/* mark inode as lightweight, so that caller (lookup_common) will
@@ -371,8 +371,8 @@ static int save_unix_sd(struct inode *inode /* object being processed */ ,assert ("nikita-644" , *area !=NULL ); sd = (reiser4_unix_stat *) * area; -put_unaligned (cpu_to_le32 (inode->i_uid), &sd->uid); -put_unaligned (cpu_to_le32 (inode->i_gid), &sd->gid); +put_unaligned (cpu_to_le32 (i_uid_read (inode)), &sd->uid); +put_unaligned (cpu_to_le32 (i_gid_read (inode)), &sd->gid);put_unaligned (cpu_to_le32 ((__u32 ) inode->i_atime.tv_sec), &sd->atime);put_unaligned (cpu_to_le32 ((__u32 ) inode->i_ctime.tv_sec), &sd->ctime);put_unaligned (cpu_to_le32 ((__u32 ) inode->i_mtime.tv_sec), &sd->mtime);
fs/reiser4/super.h +2 -2
@@ -138,13 +138,13 @@ struct reiser4_super_info_data {* default user id used for light-weight files without their own * stat-data. */ -uid_t default_uid; +__u32 default_uid;/* * default group id used for light-weight files without their own * stat-data. */ -gid_t default_gid; +__u32 default_gid;/* mkfs identifier generated at mkfs time. */ __u32 mkfs_id;
Signature · 1 line
1.8.5.1
I have updated the git with Ivan patches.
https://github.com/DestroyFX/reiser4/commit/a982eb9dbd56d99c9b369d7261c0f744b09ff0a8
Quoted 3 lines · Mathieu
I have updated the git with Ivan patches.
https://github.com/DestroyFX/reiser4/commit/a982eb9dbd56d99c9b369d7261c0f744b09ff0a8
Hi!
BTW, I also try to maintain a reiser4 git repo, backporting down to 3.2.
https://github.com/intelfx/reiser4
Signature · 1 line
Ivan Shapovalov / intelfx /