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/ncpfs | |
parent | 962830df366b66e71849040770ae6ba55a8b4aec (diff) |
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/ncpfs')
-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 4af803f13516..54cc0cdb3dcb 100644 --- a/fs/ncpfs/ncp_fs_sb.h +++ b/fs/ncpfs/ncp_fs_sb.h | |||
@@ -23,17 +23,17 @@ struct ncp_mount_data_kernel { | |||
23 | unsigned long flags; /* NCP_MOUNT_* flags */ | 23 | unsigned long flags; /* NCP_MOUNT_* flags */ |
24 | unsigned int int_flags; /* internal flags */ | 24 | unsigned int int_flags; /* internal flags */ |
25 | #define NCP_IMOUNT_LOGGEDIN_POSSIBLE 0x0001 | 25 | #define NCP_IMOUNT_LOGGEDIN_POSSIBLE 0x0001 |
26 | __kernel_uid32_t mounted_uid; /* Who may umount() this filesystem? */ | 26 | uid_t mounted_uid; /* Who may umount() this filesystem? */ |
27 | struct pid *wdog_pid; /* Who cares for our watchdog packets? */ | 27 | struct pid *wdog_pid; /* Who cares for our watchdog packets? */ |
28 | unsigned int ncp_fd; /* The socket to the ncp port */ | 28 | unsigned int ncp_fd; /* The socket to the ncp port */ |
29 | unsigned int time_out; /* How long should I wait after | 29 | unsigned int time_out; /* How long should I wait after |
30 | sending a NCP request? */ | 30 | sending a NCP request? */ |
31 | unsigned int retry_count; /* And how often should I retry? */ | 31 | unsigned int retry_count; /* And how often should I retry? */ |
32 | unsigned char mounted_vol[NCP_VOLNAME_LEN + 1]; | 32 | unsigned char mounted_vol[NCP_VOLNAME_LEN + 1]; |
33 | __kernel_uid32_t uid; | 33 | uid_t uid; |
34 | __kernel_gid32_t gid; | 34 | gid_t gid; |
35 | __kernel_mode_t file_mode; | 35 | umode_t file_mode; |
36 | __kernel_mode_t dir_mode; | 36 | umode_t dir_mode; |
37 | int info_fd; | 37 | int info_fd; |
38 | }; | 38 | }; |
39 | 39 | ||