diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-19 09:54:29 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-29 23:28:42 -0400 |
| commit | 16767652380074fd2a87ae7486e0fe0b609daf00 (patch) | |
| tree | d4b9fcab2a52718aa30ef77281b2a6bb46c952cc /fs | |
| parent | 962830df366b66e71849040770ae6ba55a8b4aec (diff) | |
| download | linux-3.10-16767652380074fd2a87ae7486e0fe0b609daf00.tar.gz linux-3.10-16767652380074fd2a87ae7486e0fe0b609daf00.tar.bz2 linux-3.10-16767652380074fd2a87ae7486e0fe0b609daf00.zip | |
get rid of idiotic misplaced __kernel_mode_t in ncfps kernel-private data structure
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ncpfs/ncp_fs_sb.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ncpfs/ncp_fs_sb.h b/fs/ncpfs/ncp_fs_sb.h index 4af803f1351..54cc0cdb3dc 100644 --- a/fs/ncpfs/ncp_fs_sb.h +++ b/fs/ncpfs/ncp_fs_sb.h @@ -23,17 +23,17 @@ struct ncp_mount_data_kernel { unsigned long flags; /* NCP_MOUNT_* flags */ unsigned int int_flags; /* internal flags */ #define NCP_IMOUNT_LOGGEDIN_POSSIBLE 0x0001 - __kernel_uid32_t mounted_uid; /* Who may umount() this filesystem? */ + uid_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]; - __kernel_uid32_t uid; - __kernel_gid32_t gid; - __kernel_mode_t file_mode; - __kernel_mode_t dir_mode; + uid_t uid; + gid_t gid; + umode_t file_mode; + umode_t dir_mode; int info_fd; }; |