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

9p: propagate umode_t

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

Al Viro 3eda0de6 587228be

+15 -14
+2 -2
fs/9p/v9fs_vfs.h
··· 54 54 55 55 struct inode *v9fs_alloc_inode(struct super_block *sb); 56 56 void v9fs_destroy_inode(struct inode *inode); 57 - struct inode *v9fs_get_inode(struct super_block *sb, int mode, dev_t); 57 + struct inode *v9fs_get_inode(struct super_block *sb, umode_t mode, dev_t); 58 58 int v9fs_init_inode(struct v9fs_session_info *v9ses, 59 - struct inode *inode, int mode, dev_t); 59 + struct inode *inode, umode_t mode, dev_t); 60 60 void v9fs_evict_inode(struct inode *inode); 61 61 ino_t v9fs_qid2ino(struct p9_qid *qid); 62 62 void v9fs_stat2inode(struct p9_wstat *, struct inode *, struct super_block *);
+11 -10
fs/9p/vfs_inode.c
··· 59 59 * 60 60 */ 61 61 62 - static u32 unixmode2p9mode(struct v9fs_session_info *v9ses, int mode) 62 + static u32 unixmode2p9mode(struct v9fs_session_info *v9ses, umode_t mode) 63 63 { 64 64 int res; 65 65 res = mode & 0777; ··· 94 94 * @rdev: major number, minor number in case of device files. 95 95 * 96 96 */ 97 - static int p9mode2unixmode(struct v9fs_session_info *v9ses, 98 - struct p9_wstat *stat, dev_t *rdev) 97 + static umode_t p9mode2unixmode(struct v9fs_session_info *v9ses, 98 + struct p9_wstat *stat, dev_t *rdev) 99 99 { 100 100 int res; 101 - int mode = stat->mode; 101 + u32 mode = stat->mode; 102 102 103 103 res = mode & S_IALLUGO; 104 104 *rdev = 0; ··· 255 255 } 256 256 257 257 int v9fs_init_inode(struct v9fs_session_info *v9ses, 258 - struct inode *inode, int mode, dev_t rdev) 258 + struct inode *inode, umode_t mode, dev_t rdev) 259 259 { 260 260 int err = 0; 261 261 ··· 329 329 330 330 break; 331 331 default: 332 - P9_DPRINTK(P9_DEBUG_ERROR, "BAD mode 0x%x S_IFMT 0x%x\n", 332 + P9_DPRINTK(P9_DEBUG_ERROR, "BAD mode 0x%hx S_IFMT 0x%x\n", 333 333 mode, mode & S_IFMT); 334 334 err = -EINVAL; 335 335 goto error; ··· 346 346 * 347 347 */ 348 348 349 - struct inode *v9fs_get_inode(struct super_block *sb, int mode, dev_t rdev) 349 + struct inode *v9fs_get_inode(struct super_block *sb, umode_t mode, dev_t rdev) 350 350 { 351 351 int err; 352 352 struct inode *inode; 353 353 struct v9fs_session_info *v9ses = sb->s_fs_info; 354 354 355 - P9_DPRINTK(P9_DEBUG_VFS, "super block: %p mode: %o\n", sb, mode); 355 + P9_DPRINTK(P9_DEBUG_VFS, "super block: %p mode: %ho\n", sb, mode); 356 356 357 357 inode = new_inode(sb); 358 358 if (!inode) { ··· 486 486 int new) 487 487 { 488 488 dev_t rdev; 489 - int retval, umode; 489 + int retval; 490 + umode_t umode; 490 491 unsigned long i_ino; 491 492 struct inode *inode; 492 493 struct v9fs_session_info *v9ses = sb->s_fs_info; ··· 1126 1125 v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode, 1127 1126 struct super_block *sb) 1128 1127 { 1129 - mode_t mode; 1128 + umode_t mode; 1130 1129 char ext[32]; 1131 1130 char tag_name[14]; 1132 1131 unsigned int i_nlink;
+1 -1
fs/9p/vfs_inode_dotl.c
··· 594 594 void 595 595 v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode) 596 596 { 597 - mode_t mode; 597 + umode_t mode; 598 598 struct v9fs_inode *v9inode = V9FS_I(inode); 599 599 600 600 if ((stat->st_result_mask & P9_STATS_BASIC) == P9_STATS_BASIC) {
+1 -1
fs/9p/vfs_super.c
··· 117 117 struct inode *inode = NULL; 118 118 struct dentry *root = NULL; 119 119 struct v9fs_session_info *v9ses = NULL; 120 - int mode = S_IRWXUGO | S_ISVTX; 120 + umode_t mode = S_IRWXUGO | S_ISVTX; 121 121 struct p9_fid *fid; 122 122 int retval = 0; 123 123