|
@@ -831,31 +831,6 @@ static inline void i_size_write(struct inode *inode, loff_t i_size)
|
|
|
#endif
|
|
|
}
|
|
|
|
|
|
-/* Helper functions so that in most cases filesystems will
|
|
|
- * not need to deal directly with kuid_t and kgid_t and can
|
|
|
- * instead deal with the raw numeric values that are stored
|
|
|
- * in the filesystem.
|
|
|
- */
|
|
|
-static inline uid_t i_uid_read(const struct inode *inode)
|
|
|
-{
|
|
|
- return from_kuid(&init_user_ns, inode->i_uid);
|
|
|
-}
|
|
|
-
|
|
|
-static inline gid_t i_gid_read(const struct inode *inode)
|
|
|
-{
|
|
|
- return from_kgid(&init_user_ns, inode->i_gid);
|
|
|
-}
|
|
|
-
|
|
|
-static inline void i_uid_write(struct inode *inode, uid_t uid)
|
|
|
-{
|
|
|
- inode->i_uid = make_kuid(&init_user_ns, uid);
|
|
|
-}
|
|
|
-
|
|
|
-static inline void i_gid_write(struct inode *inode, gid_t gid)
|
|
|
-{
|
|
|
- inode->i_gid = make_kgid(&init_user_ns, gid);
|
|
|
-}
|
|
|
-
|
|
|
static inline unsigned iminor(const struct inode *inode)
|
|
|
{
|
|
|
return MINOR(inode->i_rdev);
|
|
@@ -1461,6 +1436,31 @@ struct super_block {
|
|
|
struct list_head s_inodes; /* all inodes */
|
|
|
};
|
|
|
|
|
|
+/* Helper functions so that in most cases filesystems will
|
|
|
+ * not need to deal directly with kuid_t and kgid_t and can
|
|
|
+ * instead deal with the raw numeric values that are stored
|
|
|
+ * in the filesystem.
|
|
|
+ */
|
|
|
+static inline uid_t i_uid_read(const struct inode *inode)
|
|
|
+{
|
|
|
+ return from_kuid(inode->i_sb->s_user_ns, inode->i_uid);
|
|
|
+}
|
|
|
+
|
|
|
+static inline gid_t i_gid_read(const struct inode *inode)
|
|
|
+{
|
|
|
+ return from_kgid(inode->i_sb->s_user_ns, inode->i_gid);
|
|
|
+}
|
|
|
+
|
|
|
+static inline void i_uid_write(struct inode *inode, uid_t uid)
|
|
|
+{
|
|
|
+ inode->i_uid = make_kuid(inode->i_sb->s_user_ns, uid);
|
|
|
+}
|
|
|
+
|
|
|
+static inline void i_gid_write(struct inode *inode, gid_t gid)
|
|
|
+{
|
|
|
+ inode->i_gid = make_kgid(inode->i_sb->s_user_ns, gid);
|
|
|
+}
|
|
|
+
|
|
|
extern struct timespec current_fs_time(struct super_block *sb);
|
|
|
|
|
|
/*
|