mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-23 02:44:41 +03:00
Check whether the kernel supports i_uid/gid_read/write helpers
Since the concept of a kuid and the need to translate from it to ordinary integer type was added in kernel version 3.5 implement necessary plumbing to be able to detect this condition during compile time. If the kernel doesn't support the kuid then just fall back to directly accessing the respective struct inode's members Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Issue #4685 Issue #227
This commit is contained in:
committed by
Brian Behlendorf
parent
77943bc1dc
commit
82a1b2d628
@@ -28,6 +28,7 @@
|
||||
#define _ZFS_VFS_H
|
||||
|
||||
#include <sys/taskq.h>
|
||||
#include <sys/cred.h>
|
||||
#include <linux/backing-dev.h>
|
||||
|
||||
/*
|
||||
@@ -352,6 +353,58 @@ static inline struct inode *file_inode(const struct file *f)
|
||||
}
|
||||
#endif /* HAVE_FILE_INODE */
|
||||
|
||||
#ifdef HAVE_KUID_HELPERS
|
||||
static inline uid_t zfs_uid_read_impl(struct inode *ip)
|
||||
{
|
||||
return (from_kuid(kcred->user_ns, ip->i_uid));
|
||||
}
|
||||
|
||||
static inline uid_t zfs_uid_read(struct inode *ip)
|
||||
{
|
||||
return (zfs_uid_read_impl(ip));
|
||||
}
|
||||
|
||||
static inline gid_t zfs_gid_read_impl(struct inode *ip)
|
||||
{
|
||||
return (from_kgid(kcred->user_ns, ip->i_gid));
|
||||
}
|
||||
|
||||
static inline gid_t zfs_gid_read(struct inode *ip)
|
||||
{
|
||||
return (zfs_gid_read_impl(ip));
|
||||
}
|
||||
|
||||
static inline void zfs_uid_write(struct inode *ip, uid_t uid)
|
||||
{
|
||||
ip->i_uid = make_kuid(kcred->user_ns, uid);
|
||||
}
|
||||
|
||||
static inline void zfs_gid_write(struct inode *ip, gid_t gid)
|
||||
{
|
||||
ip->i_gid = make_kgid(kcred->user_ns, gid);
|
||||
}
|
||||
#else
|
||||
static inline uid_t zfs_uid_read(struct inode *ip)
|
||||
{
|
||||
return (ip->i_uid);
|
||||
}
|
||||
|
||||
static inline gid_t zfs_gid_read(struct inode *ip)
|
||||
{
|
||||
return (ip->i_gid);
|
||||
}
|
||||
|
||||
static inline void zfs_uid_write(struct inode *ip, uid_t uid)
|
||||
{
|
||||
ip->i_uid = uid;
|
||||
}
|
||||
|
||||
static inline void zfs_gid_write(struct inode *ip, gid_t gid)
|
||||
{
|
||||
ip->i_gid = gid;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* 2.6.38 API change
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user