From: Gwendal Grignou <gwendal@chromium.org>
To: jlbec@evilplan.org
Cc: linux-kernel@vger.kernel.org, jorgelo@chromium.org
Subject: [PATCH] configfs: initialize inode with owner
Date: Tue, 6 Mar 2018 19:36:00 -0800 [thread overview]
Message-ID: <20180307033600.102115-1-gwendal@chromium.org> (raw)
From: Sarthak Kukreti <sarthakkukreti@chromium.org>
Use standard helper to set inode owner when created from user space.
This is a noop when the owner is root.
Signed-off-by: Sarthak Kukreti <sarthakkukreti@chromium.org>
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
---
fs/configfs/configfs_internal.h | 5 ++++-
fs/configfs/inode.c | 14 ++++++++------
fs/configfs/mount.c | 2 +-
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/fs/configfs/configfs_internal.h b/fs/configfs/configfs_internal.h
index b65d1ef532d5..772fce1fd222 100644
--- a/fs/configfs/configfs_internal.h
+++ b/fs/configfs/configfs_internal.h
@@ -68,7 +68,10 @@ extern struct kmem_cache *configfs_dir_cachep;
extern int configfs_is_root(struct config_item *item);
-extern struct inode * configfs_new_inode(umode_t mode, struct configfs_dirent *, struct super_block *);
+extern struct inode *configfs_new_inode(umode_t mode,
+ struct configfs_dirent *sd,
+ struct inode *p_inode,
+ struct super_block *s);
extern int configfs_create(struct dentry *, umode_t mode, void (*init)(struct inode *));
extern int configfs_create_file(struct config_item *, const struct configfs_attribute *);
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index eae87575e681..93db05a2db1f 100644
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -108,9 +108,11 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr)
return error;
}
-static inline void set_default_inode_attr(struct inode * inode, umode_t mode)
+static inline void set_default_inode_attr(struct inode *inode,
+ struct inode *p_inode,
+ umode_t mode)
{
- inode->i_mode = mode;
+ inode_init_owner(inode, p_inode, mode);
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
}
@@ -125,7 +127,7 @@ static inline void set_inode_attr(struct inode * inode, struct iattr * iattr)
}
struct inode *configfs_new_inode(umode_t mode, struct configfs_dirent *sd,
- struct super_block *s)
+ struct inode *p_inode, struct super_block *s)
{
struct inode * inode = new_inode(s);
if (inode) {
@@ -140,7 +142,7 @@ struct inode *configfs_new_inode(umode_t mode, struct configfs_dirent *sd,
*/
set_inode_attr(inode, sd->s_iattr);
} else
- set_default_inode_attr(inode, mode);
+ set_default_inode_attr(inode, p_inode, mode);
}
return inode;
}
@@ -190,11 +192,11 @@ int configfs_create(struct dentry * dentry, umode_t mode, void (*init)(struct in
return -EEXIST;
sd = dentry->d_fsdata;
- inode = configfs_new_inode(mode, sd, dentry->d_sb);
+ p_inode = d_inode(dentry->d_parent);
+ inode = configfs_new_inode(mode, sd, p_inode, dentry->d_sb);
if (!inode)
return -ENOMEM;
- p_inode = d_inode(dentry->d_parent);
p_inode->i_mtime = p_inode->i_ctime = CURRENT_TIME;
configfs_set_inode_lock_class(sd, inode);
diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index a8f3b589a2df..23aede27c502 100644
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -78,7 +78,7 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_time_gran = 1;
inode = configfs_new_inode(S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
- &configfs_root, sb);
+ &configfs_root, NULL, sb);
if (inode) {
inode->i_op = &configfs_root_inode_operations;
inode->i_fop = &configfs_dir_operations;
--
2.16.2.660.g709887971b-goog
next reply other threads:[~2018-03-07 3:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-07 3:36 Gwendal Grignou [this message]
2018-03-08 0:11 ` Gwendal Grignou
2018-04-13 10:51 ` [PATCH] configfs: inherit file and directory owners Gwendal Grignou
2018-04-13 21:01 ` kbuild test robot
2018-04-13 22:35 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180307033600.102115-1-gwendal@chromium.org \
--to=gwendal@chromium.org \
--cc=jlbec@evilplan.org \
--cc=jorgelo@chromium.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®