diff options
Diffstat (limited to 'fs/ncpfs/dir.c')
-rw-r--r-- | fs/ncpfs/dir.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index 9c51f621e901..aeed93a6bde0 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c | |||
@@ -30,15 +30,15 @@ static void ncp_do_readdir(struct file *, void *, filldir_t, | |||
30 | 30 | ||
31 | static int ncp_readdir(struct file *, void *, filldir_t); | 31 | static int ncp_readdir(struct file *, void *, filldir_t); |
32 | 32 | ||
33 | static int ncp_create(struct inode *, struct dentry *, int, struct nameidata *); | 33 | static int ncp_create(struct inode *, struct dentry *, umode_t, struct nameidata *); |
34 | static struct dentry *ncp_lookup(struct inode *, struct dentry *, struct nameidata *); | 34 | static struct dentry *ncp_lookup(struct inode *, struct dentry *, struct nameidata *); |
35 | static int ncp_unlink(struct inode *, struct dentry *); | 35 | static int ncp_unlink(struct inode *, struct dentry *); |
36 | static int ncp_mkdir(struct inode *, struct dentry *, int); | 36 | static int ncp_mkdir(struct inode *, struct dentry *, umode_t); |
37 | static int ncp_rmdir(struct inode *, struct dentry *); | 37 | static int ncp_rmdir(struct inode *, struct dentry *); |
38 | static int ncp_rename(struct inode *, struct dentry *, | 38 | static int ncp_rename(struct inode *, struct dentry *, |
39 | struct inode *, struct dentry *); | 39 | struct inode *, struct dentry *); |
40 | static int ncp_mknod(struct inode * dir, struct dentry *dentry, | 40 | static int ncp_mknod(struct inode * dir, struct dentry *dentry, |
41 | int mode, dev_t rdev); | 41 | umode_t mode, dev_t rdev); |
42 | #if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS) | 42 | #if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS) |
43 | extern int ncp_symlink(struct inode *, struct dentry *, const char *); | 43 | extern int ncp_symlink(struct inode *, struct dentry *, const char *); |
44 | #else | 44 | #else |
@@ -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); |
@@ -979,13 +979,13 @@ out: | |||
979 | return error; | 979 | return error; |
980 | } | 980 | } |
981 | 981 | ||
982 | static int ncp_create(struct inode *dir, struct dentry *dentry, int mode, | 982 | static int ncp_create(struct inode *dir, struct dentry *dentry, umode_t mode, |
983 | struct nameidata *nd) | 983 | struct nameidata *nd) |
984 | { | 984 | { |
985 | return ncp_create_new(dir, dentry, mode, 0, 0); | 985 | return ncp_create_new(dir, dentry, mode, 0, 0); |
986 | } | 986 | } |
987 | 987 | ||
988 | static int ncp_mkdir(struct inode *dir, struct dentry *dentry, int mode) | 988 | static int ncp_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) |
989 | { | 989 | { |
990 | struct ncp_entry_info finfo; | 990 | struct ncp_entry_info finfo; |
991 | struct ncp_server *server = NCP_SERVER(dir); | 991 | struct ncp_server *server = NCP_SERVER(dir); |
@@ -1201,12 +1201,12 @@ out: | |||
1201 | } | 1201 | } |
1202 | 1202 | ||
1203 | static int ncp_mknod(struct inode * dir, struct dentry *dentry, | 1203 | static int ncp_mknod(struct inode * dir, struct dentry *dentry, |
1204 | int mode, dev_t rdev) | 1204 | umode_t mode, dev_t rdev) |
1205 | { | 1205 | { |
1206 | if (!new_valid_dev(rdev)) | 1206 | if (!new_valid_dev(rdev)) |
1207 | return -EINVAL; | 1207 | return -EINVAL; |
1208 | if (ncp_is_nfs_extras(NCP_SERVER(dir), NCP_FINFO(dir)->volNumber)) { | 1208 | if (ncp_is_nfs_extras(NCP_SERVER(dir), NCP_FINFO(dir)->volNumber)) { |
1209 | DPRINTK(KERN_DEBUG "ncp_mknod: mode = 0%o\n", mode); | 1209 | DPRINTK(KERN_DEBUG "ncp_mknod: mode = 0%ho\n", mode); |
1210 | return ncp_create_new(dir, dentry, mode, rdev, 0); | 1210 | return ncp_create_new(dir, dentry, mode, rdev, 0); |
1211 | } | 1211 | } |
1212 | return -EPERM; /* Strange, but true */ | 1212 | return -EPERM; /* Strange, but true */ |