diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 03:12:16 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:05 -0500 |
commit | 5eee25cacde61c37f1545a33d7fed88b14349976 (patch) | |
tree | cc223c8d3707205c3f94580d02ccbaf97d90f8fb | |
parent | 18df22524202ebd3416f391393e5aa986a31dc9d (diff) |
ncpfs: propagate umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/ncpfs/dir.c | 4 | ||||
-rw-r--r-- | fs/ncpfs/ncplib_kernel.h | 2 | ||||
-rw-r--r-- | fs/ncpfs/symlink.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index a2d50f803a17..aeed93a6bde0 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c | |||
@@ -919,7 +919,7 @@ out_close: | |||
919 | goto out; | 919 | goto out; |
920 | } | 920 | } |
921 | 921 | ||
922 | int ncp_create_new(struct inode *dir, struct dentry *dentry, int mode, | 922 | int ncp_create_new(struct inode *dir, struct dentry *dentry, umode_t mode, |
923 | dev_t rdev, __le32 attributes) | 923 | dev_t rdev, __le32 attributes) |
924 | { | 924 | { |
925 | struct ncp_server *server = NCP_SERVER(dir); | 925 | struct ncp_server *server = NCP_SERVER(dir); |
@@ -928,7 +928,7 @@ int ncp_create_new(struct inode *dir, struct dentry *dentry, int mode, | |||
928 | int opmode; | 928 | int opmode; |
929 | __u8 __name[NCP_MAXPATHLEN + 1]; | 929 | __u8 __name[NCP_MAXPATHLEN + 1]; |
930 | 930 | ||
931 | PPRINTK("ncp_create_new: creating %s/%s, mode=%x\n", | 931 | PPRINTK("ncp_create_new: creating %s/%s, mode=%hx\n", |
932 | dentry->d_parent->d_name.name, dentry->d_name.name, mode); | 932 | dentry->d_parent->d_name.name, dentry->d_name.name, mode); |
933 | 933 | ||
934 | ncp_age_dentry(server, dentry); | 934 | ncp_age_dentry(server, dentry); |
diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h index 09881e6aa5ad..32c06587351a 100644 --- a/fs/ncpfs/ncplib_kernel.h +++ b/fs/ncpfs/ncplib_kernel.h | |||
@@ -114,7 +114,7 @@ int ncp_dirhandle_alloc(struct ncp_server *, __u8 vol, __le32 dirent, __u8 *dirh | |||
114 | int ncp_dirhandle_free(struct ncp_server *, __u8 dirhandle); | 114 | int ncp_dirhandle_free(struct ncp_server *, __u8 dirhandle); |
115 | 115 | ||
116 | int ncp_create_new(struct inode *dir, struct dentry *dentry, | 116 | int ncp_create_new(struct inode *dir, struct dentry *dentry, |
117 | int mode, dev_t rdev, __le32 attributes); | 117 | umode_t mode, dev_t rdev, __le32 attributes); |
118 | 118 | ||
119 | static inline int ncp_is_nfs_extras(struct ncp_server* server, unsigned int volnum) { | 119 | static inline int ncp_is_nfs_extras(struct ncp_server* server, unsigned int volnum) { |
120 | #ifdef CONFIG_NCPFS_NFS_NS | 120 | #ifdef CONFIG_NCPFS_NFS_NS |
diff --git a/fs/ncpfs/symlink.c b/fs/ncpfs/symlink.c index 661f861d80c6..52439ddc8de0 100644 --- a/fs/ncpfs/symlink.c +++ b/fs/ncpfs/symlink.c | |||
@@ -108,7 +108,7 @@ int ncp_symlink(struct inode *dir, struct dentry *dentry, const char *symname) { | |||
108 | char *rawlink; | 108 | char *rawlink; |
109 | int length, err, i, outlen; | 109 | int length, err, i, outlen; |
110 | int kludge; | 110 | int kludge; |
111 | int mode; | 111 | umode_t mode; |
112 | __le32 attr; | 112 | __le32 attr; |
113 | unsigned int hdr; | 113 | unsigned int hdr; |
114 | 114 | ||