diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 02:50:15 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:00 -0500 |
commit | 576b1d67ce949e7542ff765b00eb5357e706768b (patch) | |
tree | de2c2e2a4592e98f8fc3638ddba1dbb8954ddbe6 | |
parent | dd716e64d60f2ad40e0da7db426d4bfc7eabd5d7 (diff) |
xfs: propagate umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/xfs/xfs_ialloc.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_ialloc.h | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_inode.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_inode.h | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_iops.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_utils.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_utils.h | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_vnodeops.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_vnodeops.h | 4 |
9 files changed, 13 insertions, 13 deletions
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c index 169380e66057..dad1a31aa4fc 100644 --- a/fs/xfs/xfs_ialloc.c +++ b/fs/xfs/xfs_ialloc.c | |||
@@ -447,7 +447,7 @@ STATIC xfs_buf_t * /* allocation group buffer */ | |||
447 | xfs_ialloc_ag_select( | 447 | xfs_ialloc_ag_select( |
448 | xfs_trans_t *tp, /* transaction pointer */ | 448 | xfs_trans_t *tp, /* transaction pointer */ |
449 | xfs_ino_t parent, /* parent directory inode number */ | 449 | xfs_ino_t parent, /* parent directory inode number */ |
450 | mode_t mode, /* bits set to indicate file type */ | 450 | umode_t mode, /* bits set to indicate file type */ |
451 | int okalloc) /* ok to allocate more space */ | 451 | int okalloc) /* ok to allocate more space */ |
452 | { | 452 | { |
453 | xfs_buf_t *agbp; /* allocation group header buffer */ | 453 | xfs_buf_t *agbp; /* allocation group header buffer */ |
@@ -640,7 +640,7 @@ int | |||
640 | xfs_dialloc( | 640 | xfs_dialloc( |
641 | xfs_trans_t *tp, /* transaction pointer */ | 641 | xfs_trans_t *tp, /* transaction pointer */ |
642 | xfs_ino_t parent, /* parent inode (directory) */ | 642 | xfs_ino_t parent, /* parent inode (directory) */ |
643 | mode_t mode, /* mode bits for new inode */ | 643 | umode_t mode, /* mode bits for new inode */ |
644 | int okalloc, /* ok to allocate more space */ | 644 | int okalloc, /* ok to allocate more space */ |
645 | xfs_buf_t **IO_agbp, /* in/out ag header's buffer */ | 645 | xfs_buf_t **IO_agbp, /* in/out ag header's buffer */ |
646 | boolean_t *alloc_done, /* true if we needed to replenish | 646 | boolean_t *alloc_done, /* true if we needed to replenish |
diff --git a/fs/xfs/xfs_ialloc.h b/fs/xfs/xfs_ialloc.h index bb5385475e1f..666a037398d6 100644 --- a/fs/xfs/xfs_ialloc.h +++ b/fs/xfs/xfs_ialloc.h | |||
@@ -81,7 +81,7 @@ int /* error */ | |||
81 | xfs_dialloc( | 81 | xfs_dialloc( |
82 | struct xfs_trans *tp, /* transaction pointer */ | 82 | struct xfs_trans *tp, /* transaction pointer */ |
83 | xfs_ino_t parent, /* parent inode (directory) */ | 83 | xfs_ino_t parent, /* parent inode (directory) */ |
84 | mode_t mode, /* mode bits for new inode */ | 84 | umode_t mode, /* mode bits for new inode */ |
85 | int okalloc, /* ok to allocate more space */ | 85 | int okalloc, /* ok to allocate more space */ |
86 | struct xfs_buf **agbp, /* buf for a.g. inode header */ | 86 | struct xfs_buf **agbp, /* buf for a.g. inode header */ |
87 | boolean_t *alloc_done, /* an allocation was done to replenish | 87 | boolean_t *alloc_done, /* an allocation was done to replenish |
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 755ee8164880..9dda7cc32848 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -961,7 +961,7 @@ int | |||
961 | xfs_ialloc( | 961 | xfs_ialloc( |
962 | xfs_trans_t *tp, | 962 | xfs_trans_t *tp, |
963 | xfs_inode_t *pip, | 963 | xfs_inode_t *pip, |
964 | mode_t mode, | 964 | umode_t mode, |
965 | xfs_nlink_t nlink, | 965 | xfs_nlink_t nlink, |
966 | xfs_dev_t rdev, | 966 | xfs_dev_t rdev, |
967 | prid_t prid, | 967 | prid_t prid, |
@@ -1002,7 +1002,7 @@ xfs_ialloc( | |||
1002 | return error; | 1002 | return error; |
1003 | ASSERT(ip != NULL); | 1003 | ASSERT(ip != NULL); |
1004 | 1004 | ||
1005 | ip->i_d.di_mode = (__uint16_t)mode; | 1005 | ip->i_d.di_mode = mode; |
1006 | ip->i_d.di_onlink = 0; | 1006 | ip->i_d.di_onlink = 0; |
1007 | ip->i_d.di_nlink = nlink; | 1007 | ip->i_d.di_nlink = nlink; |
1008 | ASSERT(ip->i_d.di_nlink == nlink); | 1008 | ASSERT(ip->i_d.di_nlink == nlink); |
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index b4cd4739f98e..f0e6b151ba37 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h | |||
@@ -481,7 +481,7 @@ void xfs_inode_free(struct xfs_inode *ip); | |||
481 | /* | 481 | /* |
482 | * xfs_inode.c prototypes. | 482 | * xfs_inode.c prototypes. |
483 | */ | 483 | */ |
484 | int xfs_ialloc(struct xfs_trans *, xfs_inode_t *, mode_t, | 484 | int xfs_ialloc(struct xfs_trans *, xfs_inode_t *, umode_t, |
485 | xfs_nlink_t, xfs_dev_t, prid_t, int, | 485 | xfs_nlink_t, xfs_dev_t, prid_t, int, |
486 | struct xfs_buf **, boolean_t *, xfs_inode_t **); | 486 | struct xfs_buf **, boolean_t *, xfs_inode_t **); |
487 | 487 | ||
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index c2cf9bb60863..f9babd179223 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c | |||
@@ -366,7 +366,7 @@ xfs_vn_symlink( | |||
366 | struct xfs_inode *cip = NULL; | 366 | struct xfs_inode *cip = NULL; |
367 | struct xfs_name name; | 367 | struct xfs_name name; |
368 | int error; | 368 | int error; |
369 | mode_t mode; | 369 | umode_t mode; |
370 | 370 | ||
371 | mode = S_IFLNK | | 371 | mode = S_IFLNK | |
372 | (irix_symlink_mode ? 0777 & ~current_umask() : S_IRWXUGO); | 372 | (irix_symlink_mode ? 0777 & ~current_umask() : S_IRWXUGO); |
diff --git a/fs/xfs/xfs_utils.c b/fs/xfs/xfs_utils.c index 8b32d1a4c5a1..89dbb4a50872 100644 --- a/fs/xfs/xfs_utils.c +++ b/fs/xfs/xfs_utils.c | |||
@@ -53,7 +53,7 @@ xfs_dir_ialloc( | |||
53 | output: may be a new transaction. */ | 53 | output: may be a new transaction. */ |
54 | xfs_inode_t *dp, /* directory within whose allocate | 54 | xfs_inode_t *dp, /* directory within whose allocate |
55 | the inode. */ | 55 | the inode. */ |
56 | mode_t mode, | 56 | umode_t mode, |
57 | xfs_nlink_t nlink, | 57 | xfs_nlink_t nlink, |
58 | xfs_dev_t rdev, | 58 | xfs_dev_t rdev, |
59 | prid_t prid, /* project id */ | 59 | prid_t prid, /* project id */ |
diff --git a/fs/xfs/xfs_utils.h b/fs/xfs/xfs_utils.h index 456fca314933..5eeab4690cfe 100644 --- a/fs/xfs/xfs_utils.h +++ b/fs/xfs/xfs_utils.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #ifndef __XFS_UTILS_H__ | 18 | #ifndef __XFS_UTILS_H__ |
19 | #define __XFS_UTILS_H__ | 19 | #define __XFS_UTILS_H__ |
20 | 20 | ||
21 | extern int xfs_dir_ialloc(xfs_trans_t **, xfs_inode_t *, mode_t, xfs_nlink_t, | 21 | extern int xfs_dir_ialloc(xfs_trans_t **, xfs_inode_t *, umode_t, xfs_nlink_t, |
22 | xfs_dev_t, prid_t, int, xfs_inode_t **, int *); | 22 | xfs_dev_t, prid_t, int, xfs_inode_t **, int *); |
23 | extern int xfs_droplink(xfs_trans_t *, xfs_inode_t *); | 23 | extern int xfs_droplink(xfs_trans_t *, xfs_inode_t *); |
24 | extern int xfs_bumplink(xfs_trans_t *, xfs_inode_t *); | 24 | extern int xfs_bumplink(xfs_trans_t *, xfs_inode_t *); |
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index ce9268a2f56b..f2fea868d4db 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -822,7 +822,7 @@ int | |||
822 | xfs_create( | 822 | xfs_create( |
823 | xfs_inode_t *dp, | 823 | xfs_inode_t *dp, |
824 | struct xfs_name *name, | 824 | struct xfs_name *name, |
825 | mode_t mode, | 825 | umode_t mode, |
826 | xfs_dev_t rdev, | 826 | xfs_dev_t rdev, |
827 | xfs_inode_t **ipp) | 827 | xfs_inode_t **ipp) |
828 | { | 828 | { |
@@ -1481,7 +1481,7 @@ xfs_symlink( | |||
1481 | xfs_inode_t *dp, | 1481 | xfs_inode_t *dp, |
1482 | struct xfs_name *link_name, | 1482 | struct xfs_name *link_name, |
1483 | const char *target_path, | 1483 | const char *target_path, |
1484 | mode_t mode, | 1484 | umode_t mode, |
1485 | xfs_inode_t **ipp) | 1485 | xfs_inode_t **ipp) |
1486 | { | 1486 | { |
1487 | xfs_mount_t *mp = dp->i_mount; | 1487 | xfs_mount_t *mp = dp->i_mount; |
diff --git a/fs/xfs/xfs_vnodeops.h b/fs/xfs/xfs_vnodeops.h index 35d3d513e1e9..0c877cbde142 100644 --- a/fs/xfs/xfs_vnodeops.h +++ b/fs/xfs/xfs_vnodeops.h | |||
@@ -26,7 +26,7 @@ int xfs_release(struct xfs_inode *ip); | |||
26 | int xfs_inactive(struct xfs_inode *ip); | 26 | int xfs_inactive(struct xfs_inode *ip); |
27 | int xfs_lookup(struct xfs_inode *dp, struct xfs_name *name, | 27 | int xfs_lookup(struct xfs_inode *dp, struct xfs_name *name, |
28 | struct xfs_inode **ipp, struct xfs_name *ci_name); | 28 | struct xfs_inode **ipp, struct xfs_name *ci_name); |
29 | int xfs_create(struct xfs_inode *dp, struct xfs_name *name, mode_t mode, | 29 | int xfs_create(struct xfs_inode *dp, struct xfs_name *name, umode_t mode, |
30 | xfs_dev_t rdev, struct xfs_inode **ipp); | 30 | xfs_dev_t rdev, struct xfs_inode **ipp); |
31 | int xfs_remove(struct xfs_inode *dp, struct xfs_name *name, | 31 | int xfs_remove(struct xfs_inode *dp, struct xfs_name *name, |
32 | struct xfs_inode *ip); | 32 | struct xfs_inode *ip); |
@@ -35,7 +35,7 @@ int xfs_link(struct xfs_inode *tdp, struct xfs_inode *sip, | |||
35 | int xfs_readdir(struct xfs_inode *dp, void *dirent, size_t bufsize, | 35 | int xfs_readdir(struct xfs_inode *dp, void *dirent, size_t bufsize, |
36 | xfs_off_t *offset, filldir_t filldir); | 36 | xfs_off_t *offset, filldir_t filldir); |
37 | int xfs_symlink(struct xfs_inode *dp, struct xfs_name *link_name, | 37 | int xfs_symlink(struct xfs_inode *dp, struct xfs_name *link_name, |
38 | const char *target_path, mode_t mode, struct xfs_inode **ipp); | 38 | const char *target_path, umode_t mode, struct xfs_inode **ipp); |
39 | int xfs_set_dmattrs(struct xfs_inode *ip, u_int evmask, u_int16_t state); | 39 | int xfs_set_dmattrs(struct xfs_inode *ip, u_int evmask, u_int16_t state); |
40 | int xfs_change_file_space(struct xfs_inode *ip, int cmd, | 40 | int xfs_change_file_space(struct xfs_inode *ip, int cmd, |
41 | xfs_flock64_t *bf, xfs_off_t offset, int attr_flags); | 41 | xfs_flock64_t *bf, xfs_off_t offset, int attr_flags); |