diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-07 16:28:28 -0800 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2013-02-13 06:15:13 -0800 |
| commit | 1ac7fd8190b79c822631ed537186fb8b2d9e9b74 (patch) | |
| tree | de88733bf16f6ed670e0de354dded191ae844717 /fs/ncpfs/ncp_fs_sb.h | |
| parent | 0f07bd3753e25c80fe24428273c791f350b3a1eb (diff) | |
| download | op-kernel-dev-1ac7fd8190b79c822631ed537186fb8b2d9e9b74.zip op-kernel-dev-1ac7fd8190b79c822631ed537186fb8b2d9e9b74.tar.gz | |
ncpfs: Support interacting with multiple user namespaces
ncpfs does not natively support uids and gids so this conversion was
simply a matter of updating the the type of the mounteduid, the uid
and the gid on the superblock. Fixing the ioctls that read them,
updating the mount option parser and the mount option printer.
Cc: Petr Vandrovec <petr@vandrovec.name>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs/ncpfs/ncp_fs_sb.h')
| -rw-r--r-- | fs/ncpfs/ncp_fs_sb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ncpfs/ncp_fs_sb.h b/fs/ncpfs/ncp_fs_sb.h index 54cc0cd..c51b2c5 100644 --- a/fs/ncpfs/ncp_fs_sb.h +++ b/fs/ncpfs/ncp_fs_sb.h @@ -23,15 +23,15 @@ struct ncp_mount_data_kernel { unsigned long flags; /* NCP_MOUNT_* flags */ unsigned int int_flags; /* internal flags */ #define NCP_IMOUNT_LOGGEDIN_POSSIBLE 0x0001 - uid_t mounted_uid; /* Who may umount() this filesystem? */ + kuid_t mounted_uid; /* Who may umount() this filesystem? */ struct pid *wdog_pid; /* Who cares for our watchdog packets? */ unsigned int ncp_fd; /* The socket to the ncp port */ unsigned int time_out; /* How long should I wait after sending a NCP request? */ unsigned int retry_count; /* And how often should I retry? */ unsigned char mounted_vol[NCP_VOLNAME_LEN + 1]; - uid_t uid; - gid_t gid; + kuid_t uid; + kgid_t gid; umode_t file_mode; umode_t dir_mode; int info_fd; |
