fs: propagate umode_t, misc bits
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
Родитель
030a8ba48f
Коммит
175a4eb7ea
|
|
@ -4412,8 +4412,8 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
|
|||
struct btrfs_root *root,
|
||||
struct inode *dir,
|
||||
const char *name, int name_len,
|
||||
u64 ref_objectid, u64 objectid, int mode,
|
||||
u64 *index)
|
||||
u64 ref_objectid, u64 objectid,
|
||||
umode_t mode, u64 *index)
|
||||
{
|
||||
struct inode *inode;
|
||||
struct btrfs_inode_item *inode_item;
|
||||
|
|
|
|||
|
|
@ -378,7 +378,7 @@ static int cramfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
|
|||
unsigned long nextoffset;
|
||||
char *name;
|
||||
ino_t ino;
|
||||
mode_t mode;
|
||||
umode_t mode;
|
||||
int namelen, error;
|
||||
|
||||
mutex_lock(&read_mutex);
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ static int ecryptfs_interpose(struct dentry *lower_dentry,
|
|||
*/
|
||||
static struct inode *
|
||||
ecryptfs_do_create(struct inode *directory_inode,
|
||||
struct dentry *ecryptfs_dentry, int mode)
|
||||
struct dentry *ecryptfs_dentry, umode_t mode)
|
||||
{
|
||||
int rc;
|
||||
struct dentry *lower_dentry;
|
||||
|
|
|
|||
|
|
@ -187,10 +187,10 @@ vxfs_stiget(struct super_block *sbp, ino_t ino)
|
|||
* vxfs_transmod returns a Linux mode_t for a given
|
||||
* VxFS inode structure.
|
||||
*/
|
||||
static __inline__ mode_t
|
||||
static __inline__ umode_t
|
||||
vxfs_transmod(struct vxfs_inode_info *vip)
|
||||
{
|
||||
mode_t ret = vip->vii_mode & ~VXFS_TYPE_MASK;
|
||||
umode_t ret = vip->vii_mode & ~VXFS_TYPE_MASK;
|
||||
|
||||
if (VXFS_ISFIFO(vip))
|
||||
ret |= S_IFIFO;
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@ out:
|
|||
*/
|
||||
|
||||
static int create_ok(struct gfs2_inode *dip, const struct qstr *name,
|
||||
unsigned int mode)
|
||||
umode_t mode)
|
||||
{
|
||||
int error;
|
||||
|
||||
|
|
@ -364,7 +364,7 @@ static int create_ok(struct gfs2_inode *dip, const struct qstr *name,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void munge_mode_uid_gid(struct gfs2_inode *dip, unsigned int *mode,
|
||||
static void munge_mode_uid_gid(struct gfs2_inode *dip, umode_t *mode,
|
||||
unsigned int *uid, unsigned int *gid)
|
||||
{
|
||||
if (GFS2_SB(&dip->i_inode)->sd_args.ar_suiddir &&
|
||||
|
|
@ -447,7 +447,7 @@ static void gfs2_init_dir(struct buffer_head *dibh,
|
|||
*/
|
||||
|
||||
static void init_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl,
|
||||
const struct gfs2_inum_host *inum, unsigned int mode,
|
||||
const struct gfs2_inum_host *inum, umode_t mode,
|
||||
unsigned int uid, unsigned int gid,
|
||||
const u64 *generation, dev_t dev, const char *symname,
|
||||
unsigned size, struct buffer_head **bhp)
|
||||
|
|
@ -516,7 +516,7 @@ static void init_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl,
|
|||
}
|
||||
|
||||
static int make_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl,
|
||||
unsigned int mode, const struct gfs2_inum_host *inum,
|
||||
umode_t mode, const struct gfs2_inum_host *inum,
|
||||
const u64 *generation, dev_t dev, const char *symname,
|
||||
unsigned int size, struct buffer_head **bhp)
|
||||
{
|
||||
|
|
@ -659,7 +659,7 @@ static int gfs2_security_init(struct gfs2_inode *dip, struct gfs2_inode *ip,
|
|||
*/
|
||||
|
||||
static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
|
||||
unsigned int mode, dev_t dev, const char *symname,
|
||||
umode_t mode, dev_t dev, const char *symname,
|
||||
unsigned int size, int excl)
|
||||
{
|
||||
const struct qstr *name = &dentry->d_name;
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ static int nfsd_acceptable(void *expv, struct dentry *dentry)
|
|||
* the write call).
|
||||
*/
|
||||
static inline __be32
|
||||
nfsd_mode_check(struct svc_rqst *rqstp, umode_t mode, int requested)
|
||||
nfsd_mode_check(struct svc_rqst *rqstp, umode_t mode, umode_t requested)
|
||||
{
|
||||
mode &= S_IFMT;
|
||||
|
||||
|
|
@ -293,7 +293,7 @@ out:
|
|||
* include/linux/nfsd/nfsd.h.
|
||||
*/
|
||||
__be32
|
||||
fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
|
||||
fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, int access)
|
||||
{
|
||||
struct svc_export *exp;
|
||||
struct dentry *dentry;
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ extern char * SVCFH_fmt(struct svc_fh *fhp);
|
|||
/*
|
||||
* Function prototypes
|
||||
*/
|
||||
__be32 fh_verify(struct svc_rqst *, struct svc_fh *, int, int);
|
||||
__be32 fh_verify(struct svc_rqst *, struct svc_fh *, umode_t, int);
|
||||
__be32 fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *);
|
||||
__be32 fh_update(struct svc_fh *);
|
||||
void fh_put(struct svc_fh *);
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
|
|||
struct dentry *dentry;
|
||||
struct inode *inode;
|
||||
int accmode = NFSD_MAY_SATTR;
|
||||
int ftype = 0;
|
||||
umode_t ftype = 0;
|
||||
__be32 err;
|
||||
int host_err;
|
||||
int size_change = 0;
|
||||
|
|
@ -730,7 +730,7 @@ static int nfsd_open_break_lease(struct inode *inode, int access)
|
|||
* N.B. After this call fhp needs an fh_put
|
||||
*/
|
||||
__be32
|
||||
nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
|
||||
nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
|
||||
int access, struct file **filp)
|
||||
{
|
||||
struct dentry *dentry;
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ __be32 do_nfsd_create(struct svc_rqst *, struct svc_fh *,
|
|||
__be32 nfsd_commit(struct svc_rqst *, struct svc_fh *,
|
||||
loff_t, unsigned long);
|
||||
#endif /* CONFIG_NFSD_V3 */
|
||||
__be32 nfsd_open(struct svc_rqst *, struct svc_fh *, int,
|
||||
__be32 nfsd_open(struct svc_rqst *, struct svc_fh *, umode_t,
|
||||
int, struct file **);
|
||||
void nfsd_close(struct file *);
|
||||
__be32 nfsd_read(struct svc_rqst *, struct svc_fh *,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче