Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

get rid of idiotic misplaced __kernel_mode_t in ncfps kernel-private data structure

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 16767652 962830df

+5 -5
+5 -5
fs/ncpfs/ncp_fs_sb.h
··· 23 23 unsigned long flags; /* NCP_MOUNT_* flags */ 24 24 unsigned int int_flags; /* internal flags */ 25 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 27 struct pid *wdog_pid; /* Who cares for our watchdog packets? */ 28 28 unsigned int ncp_fd; /* The socket to the ncp port */ 29 29 unsigned int time_out; /* How long should I wait after 30 30 sending a NCP request? */ 31 31 unsigned int retry_count; /* And how often should I retry? */ 32 32 unsigned char mounted_vol[NCP_VOLNAME_LEN + 1]; 33 - __kernel_uid32_t uid; 34 - __kernel_gid32_t gid; 35 - __kernel_mode_t file_mode; 36 - __kernel_mode_t dir_mode; 33 + uid_t uid; 34 + gid_t gid; 35 + umode_t file_mode; 36 + umode_t dir_mode; 37 37 int info_fd; 38 38 }; 39 39