From efd44635989dfd21f365f561737980981f4252ee Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 19 May 2012 09:54:29 -0400 Subject: [PATCH] --- yaml --- r: 310011 b: refs/heads/master c: 16767652380074fd2a87ae7486e0fe0b609daf00 h: refs/heads/master i: 310009: 31dd6f112a848ea9d2eb18347c5eef3e2f8d41f1 310007: a28d2b6792a3f16818643a683b4996558933714b v: v3 --- [refs] | 2 +- trunk/fs/ncpfs/ncp_fs_sb.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b6ac4c64a159..cccf9d3e6896 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 962830df366b66e71849040770ae6ba55a8b4aec +refs/heads/master: 16767652380074fd2a87ae7486e0fe0b609daf00 diff --git a/trunk/fs/ncpfs/ncp_fs_sb.h b/trunk/fs/ncpfs/ncp_fs_sb.h index 4af803f13516..54cc0cdb3dcb 100644 --- a/trunk/fs/ncpfs/ncp_fs_sb.h +++ b/trunk/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; };