qstr: constify instances in hfsplus

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

diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c
index fb707e8..142534d 100644 (file)
--- a/fs/hfsplus/catalog.c
+++ b/fs/hfsplus/catalog.c
@@ -40,7 +40,7 @@ int hfsplus_cat_bin_cmp_key(const hfsplus_btree_key *k1,
 
 /* Generates key for catalog file/folders record. */
 int hfsplus_cat_build_key(struct super_block *sb,
 
 /* Generates key for catalog file/folders record. */
 int hfsplus_cat_build_key(struct super_block *sb,

-               hfsplus_btree_key *key, u32 parent, struct qstr *str)
+               hfsplus_btree_key *key, u32 parent, const struct qstr *str)

 {
        int len, err;
 
 {
        int len, err;
 


@@ -174,7 +174,7 @@ static int hfsplus_cat_build_record(hfsplus_cat_entry *entry,
 
 static int hfsplus_fill_cat_thread(struct super_block *sb,
                                   hfsplus_cat_entry *entry, int type,
 
 static int hfsplus_fill_cat_thread(struct super_block *sb,
                                   hfsplus_cat_entry *entry, int type,

-                                  u32 parentid, struct qstr *str)
+                                  u32 parentid, const struct qstr *str)

 {
        int err;
 
 {
        int err;
 


@@ -250,7 +250,7 @@ static void hfsplus_subfolders_dec(struct inode *dir)
 }
 
 int hfsplus_create_cat(u32 cnid, struct inode *dir,
 }
 
 int hfsplus_create_cat(u32 cnid, struct inode *dir,

-               struct qstr *str, struct inode *inode)
+               const struct qstr *str, struct inode *inode)

 {
        struct super_block *sb = dir->i_sb;
        struct hfs_find_data fd;
 {
        struct super_block *sb = dir->i_sb;
        struct hfs_find_data fd;


@@ -318,7 +318,7 @@ err2:
        return err;
 }
 
        return err;
 }
 

-int hfsplus_delete_cat(u32 cnid, struct inode *dir, struct qstr *str)
+int hfsplus_delete_cat(u32 cnid, struct inode *dir, const struct qstr *str)

 {
        struct super_block *sb = dir->i_sb;
        struct hfs_find_data fd;
 {
        struct super_block *sb = dir->i_sb;
        struct hfs_find_data fd;


@@ -415,8 +415,8 @@ out:
 }
 
 int hfsplus_rename_cat(u32 cnid,
 }
 
 int hfsplus_rename_cat(u32 cnid,

-                      struct inode *src_dir, struct qstr *src_name,
-                      struct inode *dst_dir, struct qstr *dst_name)
+                      struct inode *src_dir, const struct qstr *src_name,
+                      struct inode *dst_dir, const struct qstr *dst_name)

 {
        struct super_block *sb = src_dir->i_sb;
        struct hfs_find_data src_fd, dst_fd;
 {
        struct super_block *sb = src_dir->i_sb;
        struct hfs_find_data src_fd, dst_fd;

diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index fdc3446..9ed1d9b 100644 (file)
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -445,17 +445,17 @@ int hfsplus_cat_case_cmp_key(const hfsplus_btree_key *k1,
 int hfsplus_cat_bin_cmp_key(const hfsplus_btree_key *k1,
                            const hfsplus_btree_key *k2);
 int hfsplus_cat_build_key(struct super_block *sb, hfsplus_btree_key *key,
 int hfsplus_cat_bin_cmp_key(const hfsplus_btree_key *k1,
                            const hfsplus_btree_key *k2);
 int hfsplus_cat_build_key(struct super_block *sb, hfsplus_btree_key *key,

-                          u32 parent, struct qstr *str);
+                          u32 parent, const struct qstr *str);

 void hfsplus_cat_build_key_with_cnid(struct super_block *sb,
                                     hfsplus_btree_key *key, u32 parent);
 void hfsplus_cat_set_perms(struct inode *inode, struct hfsplus_perm *perms);
 int hfsplus_find_cat(struct super_block *sb, u32 cnid,
                     struct hfs_find_data *fd);
 void hfsplus_cat_build_key_with_cnid(struct super_block *sb,
                                     hfsplus_btree_key *key, u32 parent);
 void hfsplus_cat_set_perms(struct inode *inode, struct hfsplus_perm *perms);
 int hfsplus_find_cat(struct super_block *sb, u32 cnid,
                     struct hfs_find_data *fd);

-int hfsplus_create_cat(u32 cnid, struct inode *dir, struct qstr *str,
+int hfsplus_create_cat(u32 cnid, struct inode *dir, const struct qstr *str,

                       struct inode *inode);
                       struct inode *inode);

-int hfsplus_delete_cat(u32 cnid, struct inode *dir, struct qstr *str);
-int hfsplus_rename_cat(u32 cnid, struct inode *src_dir, struct qstr *src_name,
-                      struct inode *dst_dir, struct qstr *dst_name);
+int hfsplus_delete_cat(u32 cnid, struct inode *dir, const struct qstr *str);
+int hfsplus_rename_cat(u32 cnid, struct inode *src_dir, const struct qstr *src_name,
+                      struct inode *dst_dir, const struct qstr *dst_name);

 
 /* dir.c */
 extern const struct inode_operations hfsplus_dir_inode_operations;
 
 /* dir.c */
 extern const struct inode_operations hfsplus_dir_inode_operations;