mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-23 21:19:04 -04:00
Merge branch 'work.const-qstr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull qstr constification updates from Al Viro: "Fairly self-contained bunch - surprising lot of places passes struct qstr * as an argument when const struct qstr * would suffice; it complicates analysis for no good reason. I'd prefer to feed that separately from the assorted fixes (those are in #for-linus and with somewhat trickier topology)" * 'work.const-qstr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: qstr: constify instances in adfs qstr: constify instances in lustre qstr: constify instances in f2fs qstr: constify instances in ext2 qstr: constify instances in vfat qstr: constify instances in procfs qstr: constify instances in fuse qstr constify instances in fs/dcache.c qstr: constify instances in nfs qstr: constify instances in ocfs2 qstr: constify instances in autofs4 qstr: constify instances in hfs qstr: constify instances in hfsplus qstr: constify instances in logfs qstr: constify dentry_init_security
This commit is contained in:
commit
835c92d43b
37 changed files with 95 additions and 100 deletions
|
|
@ -263,7 +263,7 @@ extern void d_rehash(struct dentry *);
|
|||
|
||||
extern void d_add(struct dentry *, struct inode *);
|
||||
|
||||
extern void dentry_update_name_case(struct dentry *, struct qstr *);
|
||||
extern void dentry_update_name_case(struct dentry *, const struct qstr *);
|
||||
|
||||
/* used for rename() and baskets */
|
||||
extern void d_move(struct dentry *, struct dentry *);
|
||||
|
|
|
|||
|
|
@ -1356,7 +1356,7 @@ union security_list_options {
|
|||
struct super_block *newsb);
|
||||
int (*sb_parse_opts_str)(char *options, struct security_mnt_opts *opts);
|
||||
int (*dentry_init_security)(struct dentry *dentry, int mode,
|
||||
struct qstr *name, void **ctx,
|
||||
const struct qstr *name, void **ctx,
|
||||
u32 *ctxlen);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1532,7 +1532,7 @@ struct nfs_rpc_ops {
|
|||
struct nfs_fattr *, struct nfs4_label *);
|
||||
int (*setattr) (struct dentry *, struct nfs_fattr *,
|
||||
struct iattr *);
|
||||
int (*lookup) (struct inode *, struct qstr *,
|
||||
int (*lookup) (struct inode *, const struct qstr *,
|
||||
struct nfs_fh *, struct nfs_fattr *,
|
||||
struct nfs4_label *);
|
||||
int (*access) (struct inode *, struct nfs_access_entry *);
|
||||
|
|
@ -1540,18 +1540,18 @@ struct nfs_rpc_ops {
|
|||
unsigned int);
|
||||
int (*create) (struct inode *, struct dentry *,
|
||||
struct iattr *, int);
|
||||
int (*remove) (struct inode *, struct qstr *);
|
||||
int (*remove) (struct inode *, const struct qstr *);
|
||||
void (*unlink_setup) (struct rpc_message *, struct inode *dir);
|
||||
void (*unlink_rpc_prepare) (struct rpc_task *, struct nfs_unlinkdata *);
|
||||
int (*unlink_done) (struct rpc_task *, struct inode *);
|
||||
void (*rename_setup) (struct rpc_message *msg, struct inode *dir);
|
||||
void (*rename_rpc_prepare)(struct rpc_task *task, struct nfs_renamedata *);
|
||||
int (*rename_done) (struct rpc_task *task, struct inode *old_dir, struct inode *new_dir);
|
||||
int (*link) (struct inode *, struct inode *, struct qstr *);
|
||||
int (*link) (struct inode *, struct inode *, const struct qstr *);
|
||||
int (*symlink) (struct inode *, struct dentry *, struct page *,
|
||||
unsigned int, struct iattr *);
|
||||
int (*mkdir) (struct inode *, struct dentry *, struct iattr *);
|
||||
int (*rmdir) (struct inode *, struct qstr *);
|
||||
int (*rmdir) (struct inode *, const struct qstr *);
|
||||
int (*readdir) (struct dentry *, struct rpc_cred *,
|
||||
u64, struct page **, unsigned int, int);
|
||||
int (*mknod) (struct inode *, struct dentry *, struct iattr *,
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@ int security_sb_clone_mnt_opts(const struct super_block *oldsb,
|
|||
struct super_block *newsb);
|
||||
int security_sb_parse_opts_str(char *options, struct security_mnt_opts *opts);
|
||||
int security_dentry_init_security(struct dentry *dentry, int mode,
|
||||
struct qstr *name, void **ctx,
|
||||
const struct qstr *name, void **ctx,
|
||||
u32 *ctxlen);
|
||||
|
||||
int security_inode_alloc(struct inode *inode);
|
||||
|
|
@ -591,7 +591,7 @@ static inline void security_inode_free(struct inode *inode)
|
|||
|
||||
static inline int security_dentry_init_security(struct dentry *dentry,
|
||||
int mode,
|
||||
struct qstr *name,
|
||||
const struct qstr *name,
|
||||
void **ctx,
|
||||
u32 *ctxlen)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue