From: Al Viro Date: Sat, 19 May 2012 13:54:29 +0000 (-0400) Subject: get rid of idiotic misplaced __kernel_mode_t in ncfps kernel-private data structure X-Git-Tag: upstream/snapshot3+hdmi~7309^2~58 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16767652380074fd2a87ae7486e0fe0b609daf00;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git get rid of idiotic misplaced __kernel_mode_t in ncfps kernel-private data structure Signed-off-by: Al Viro --- diff --git a/fs/ncpfs/ncp_fs_sb.h b/fs/ncpfs/ncp_fs_sb.h index 4af803f..54cc0cd 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; };