qstr: constify instances in hfs
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>hifive-unleashed-5.1
parent
b5cce521e8
commit
71e939634d
|
@ -20,7 +20,7 @@
|
||||||
*
|
*
|
||||||
* Given the ID of the parent and the name build a search key.
|
* Given the ID of the parent and the name build a search key.
|
||||||
*/
|
*/
|
||||||
void hfs_cat_build_key(struct super_block *sb, btree_key *key, u32 parent, struct qstr *name)
|
void hfs_cat_build_key(struct super_block *sb, btree_key *key, u32 parent, const struct qstr *name)
|
||||||
{
|
{
|
||||||
key->cat.reserved = 0;
|
key->cat.reserved = 0;
|
||||||
key->cat.ParID = cpu_to_be32(parent);
|
key->cat.ParID = cpu_to_be32(parent);
|
||||||
|
@ -64,7 +64,7 @@ static int hfs_cat_build_record(hfs_cat_rec *rec, u32 cnid, struct inode *inode)
|
||||||
|
|
||||||
static int hfs_cat_build_thread(struct super_block *sb,
|
static int hfs_cat_build_thread(struct super_block *sb,
|
||||||
hfs_cat_rec *rec, int type,
|
hfs_cat_rec *rec, int type,
|
||||||
u32 parentid, struct qstr *name)
|
u32 parentid, const struct qstr *name)
|
||||||
{
|
{
|
||||||
rec->type = type;
|
rec->type = type;
|
||||||
memset(rec->thread.reserved, 0, sizeof(rec->thread.reserved));
|
memset(rec->thread.reserved, 0, sizeof(rec->thread.reserved));
|
||||||
|
@ -79,7 +79,7 @@ static int hfs_cat_build_thread(struct super_block *sb,
|
||||||
* Add a new file or directory to the catalog B-tree and
|
* Add a new file or directory to the catalog B-tree and
|
||||||
* return a (struct hfs_cat_entry) for it in '*result'.
|
* return a (struct hfs_cat_entry) for it in '*result'.
|
||||||
*/
|
*/
|
||||||
int hfs_cat_create(u32 cnid, struct inode *dir, struct qstr *str, struct inode *inode)
|
int hfs_cat_create(u32 cnid, struct inode *dir, const struct qstr *str, struct inode *inode)
|
||||||
{
|
{
|
||||||
struct hfs_find_data fd;
|
struct hfs_find_data fd;
|
||||||
struct super_block *sb;
|
struct super_block *sb;
|
||||||
|
@ -210,7 +210,7 @@ int hfs_cat_find_brec(struct super_block *sb, u32 cnid,
|
||||||
* Delete the indicated file or directory.
|
* Delete the indicated file or directory.
|
||||||
* The associated thread is also removed unless ('with_thread'==0).
|
* The associated thread is also removed unless ('with_thread'==0).
|
||||||
*/
|
*/
|
||||||
int hfs_cat_delete(u32 cnid, struct inode *dir, struct qstr *str)
|
int hfs_cat_delete(u32 cnid, struct inode *dir, const struct qstr *str)
|
||||||
{
|
{
|
||||||
struct super_block *sb;
|
struct super_block *sb;
|
||||||
struct hfs_find_data fd;
|
struct hfs_find_data fd;
|
||||||
|
@ -277,8 +277,8 @@ out:
|
||||||
* If the destination exists it is removed and a
|
* If the destination exists it is removed and a
|
||||||
* (struct hfs_cat_entry) for it is returned in '*result'.
|
* (struct hfs_cat_entry) for it is returned in '*result'.
|
||||||
*/
|
*/
|
||||||
int hfs_cat_move(u32 cnid, struct inode *src_dir, struct qstr *src_name,
|
int hfs_cat_move(u32 cnid, struct inode *src_dir, const struct qstr *src_name,
|
||||||
struct inode *dst_dir, struct qstr *dst_name)
|
struct inode *dst_dir, const struct qstr *dst_name)
|
||||||
{
|
{
|
||||||
struct super_block *sb;
|
struct super_block *sb;
|
||||||
struct hfs_find_data src_fd, dst_fd;
|
struct hfs_find_data src_fd, dst_fd;
|
||||||
|
|
|
@ -178,11 +178,11 @@ extern int hfs_clear_vbm_bits(struct super_block *, u16, u16);
|
||||||
extern int hfs_cat_keycmp(const btree_key *, const btree_key *);
|
extern int hfs_cat_keycmp(const btree_key *, const btree_key *);
|
||||||
struct hfs_find_data;
|
struct hfs_find_data;
|
||||||
extern int hfs_cat_find_brec(struct super_block *, u32, struct hfs_find_data *);
|
extern int hfs_cat_find_brec(struct super_block *, u32, struct hfs_find_data *);
|
||||||
extern int hfs_cat_create(u32, struct inode *, struct qstr *, struct inode *);
|
extern int hfs_cat_create(u32, struct inode *, const struct qstr *, struct inode *);
|
||||||
extern int hfs_cat_delete(u32, struct inode *, struct qstr *);
|
extern int hfs_cat_delete(u32, struct inode *, const struct qstr *);
|
||||||
extern int hfs_cat_move(u32, struct inode *, struct qstr *,
|
extern int hfs_cat_move(u32, struct inode *, const struct qstr *,
|
||||||
struct inode *, struct qstr *);
|
struct inode *, const struct qstr *);
|
||||||
extern void hfs_cat_build_key(struct super_block *, btree_key *, u32, struct qstr *);
|
extern void hfs_cat_build_key(struct super_block *, btree_key *, u32, const struct qstr *);
|
||||||
|
|
||||||
/* dir.c */
|
/* dir.c */
|
||||||
extern const struct file_operations hfs_dir_operations;
|
extern const struct file_operations hfs_dir_operations;
|
||||||
|
@ -201,7 +201,7 @@ extern int hfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
|
||||||
extern const struct address_space_operations hfs_aops;
|
extern const struct address_space_operations hfs_aops;
|
||||||
extern const struct address_space_operations hfs_btree_aops;
|
extern const struct address_space_operations hfs_btree_aops;
|
||||||
|
|
||||||
extern struct inode *hfs_new_inode(struct inode *, struct qstr *, umode_t);
|
extern struct inode *hfs_new_inode(struct inode *, const struct qstr *, umode_t);
|
||||||
extern void hfs_inode_write_fork(struct inode *, struct hfs_extent *, __be32 *, __be32 *);
|
extern void hfs_inode_write_fork(struct inode *, struct hfs_extent *, __be32 *, __be32 *);
|
||||||
extern int hfs_write_inode(struct inode *, struct writeback_control *);
|
extern int hfs_write_inode(struct inode *, struct writeback_control *);
|
||||||
extern int hfs_inode_setattr(struct dentry *, struct iattr *);
|
extern int hfs_inode_setattr(struct dentry *, struct iattr *);
|
||||||
|
@ -237,7 +237,7 @@ extern int hfs_compare_dentry(const struct dentry *parent, const struct dentry *
|
||||||
unsigned int len, const char *str, const struct qstr *name);
|
unsigned int len, const char *str, const struct qstr *name);
|
||||||
|
|
||||||
/* trans.c */
|
/* trans.c */
|
||||||
extern void hfs_asc2mac(struct super_block *, struct hfs_name *, struct qstr *);
|
extern void hfs_asc2mac(struct super_block *, struct hfs_name *, const struct qstr *);
|
||||||
extern int hfs_mac2asc(struct super_block *, char *, const struct hfs_name *);
|
extern int hfs_mac2asc(struct super_block *, char *, const struct hfs_name *);
|
||||||
|
|
||||||
/* super.c */
|
/* super.c */
|
||||||
|
|
|
@ -177,7 +177,7 @@ const struct address_space_operations hfs_aops = {
|
||||||
/*
|
/*
|
||||||
* hfs_new_inode
|
* hfs_new_inode
|
||||||
*/
|
*/
|
||||||
struct inode *hfs_new_inode(struct inode *dir, struct qstr *name, umode_t mode)
|
struct inode *hfs_new_inode(struct inode *dir, const struct qstr *name, umode_t mode)
|
||||||
{
|
{
|
||||||
struct super_block *sb = dir->i_sb;
|
struct super_block *sb = dir->i_sb;
|
||||||
struct inode *inode = new_inode(sb);
|
struct inode *inode = new_inode(sb);
|
||||||
|
|
|
@ -94,7 +94,7 @@ out:
|
||||||
* This routine is a inverse to hfs_mac2triv().
|
* This routine is a inverse to hfs_mac2triv().
|
||||||
* A ':' is replaced by a '/'.
|
* A ':' is replaced by a '/'.
|
||||||
*/
|
*/
|
||||||
void hfs_asc2mac(struct super_block *sb, struct hfs_name *out, struct qstr *in)
|
void hfs_asc2mac(struct super_block *sb, struct hfs_name *out, const struct qstr *in)
|
||||||
{
|
{
|
||||||
struct nls_table *nls_disk = HFS_SB(sb)->nls_disk;
|
struct nls_table *nls_disk = HFS_SB(sb)->nls_disk;
|
||||||
struct nls_table *nls_io = HFS_SB(sb)->nls_io;
|
struct nls_table *nls_io = HFS_SB(sb)->nls_io;
|
||||||
|
|
Loading…
Reference in New Issue