vserver 2.0 rc7

[linux-2.6.git] / fs / hfsplus / dir.c

diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index 1c62bb8..7bda766 100644 (file)
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -40,7 +40,7 @@ static struct dentry *hfsplus_lookup(struct inode *dir, struct dentry *dentry,
        sb = dir->i_sb;
        dentry->d_fsdata = NULL;
        hfs_find_init(HFSPLUS_SB(sb).cat_tree, &fd);
-       hfsplus_cat_build_key(fd.search_key, dir->i_ino, &dentry->d_name);
+       hfsplus_cat_build_key(sb, fd.search_key, dir->i_ino, &dentry->d_name);
 again:
        err = hfs_brec_read(&fd, &entry, sizeof(entry));
        if (err) {
@@ -80,7 +80,7 @@ again:
                        linkid = be32_to_cpu(entry.file.permissions.dev);
                        str.len = sprintf(name, "iNode%d", linkid);
                        str.name = name;
-                       hfsplus_cat_build_key(fd.search_key, HFSPLUS_SB(sb).hidden_dir->i_ino, &str);
+                       hfsplus_cat_build_key(sb, fd.search_key, HFSPLUS_SB(sb).hidden_dir->i_ino, &str);
                        goto again;
                } else if (!dentry->d_fsdata)
                        dentry->d_fsdata = (void *)(unsigned long)cnid;
@@ -118,7 +118,7 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
                return 0;
 
        hfs_find_init(HFSPLUS_SB(sb).cat_tree, &fd);
-       hfsplus_cat_build_key(fd.search_key, inode->i_ino, NULL);
+       hfsplus_cat_build_key(sb, fd.search_key, inode->i_ino, NULL);
        err = hfs_brec_find(&fd);
        if (err)
                goto out;
@@ -164,7 +164,7 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
                hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, fd.entrylength);
                type = be16_to_cpu(entry.type);
                len = HFSPLUS_MAX_STRLEN;
-               err = hfsplus_uni2asc(&fd.key->cat.name, strbuf, &len);
+               err = hfsplus_uni2asc(sb, &fd.key->cat.name, strbuf, &len);
                if (err)
                        goto out;
                if (type == HFSPLUS_FOLDER) {
@@ -228,8 +228,8 @@ static int hfsplus_dir_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-int hfsplus_create(struct inode *dir, struct dentry *dentry, int mode,
-                  struct nameidata *nd)
+static int hfsplus_create(struct inode *dir, struct dentry *dentry, int mode,
+                         struct nameidata *nd)
 {
        struct inode *inode;
        int res;
@@ -250,7 +250,8 @@ int hfsplus_create(struct inode *dir, struct dentry *dentry, int mode,
        return 0;
 }
 
-int hfsplus_link(struct dentry *src_dentry, struct inode *dst_dir, struct dentry *dst_dentry)
+static int hfsplus_link(struct dentry *src_dentry, struct inode *dst_dir,
+                       struct dentry *dst_dentry)
 {
        struct super_block *sb = dst_dir->i_sb;
        struct inode *inode = src_dentry->d_inode;
@@ -302,7 +303,7 @@ int hfsplus_link(struct dentry *src_dentry, struct inode *dst_dir, struct dentry
        return 0;
 }
 
-int hfsplus_unlink(struct inode *dir, struct dentry *dentry)
+static int hfsplus_unlink(struct inode *dir, struct dentry *dentry)
 {
        struct super_block *sb = dir->i_sb;
        struct inode *inode = dentry->d_inode;
@@ -346,7 +347,7 @@ int hfsplus_unlink(struct inode *dir, struct dentry *dentry)
        return res;
 }
 
-int hfsplus_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+static int hfsplus_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
        struct inode *inode;
        int res;
@@ -367,7 +368,7 @@ int hfsplus_mkdir(struct inode *dir, struct dentry *dentry, int mode)
        return 0;
 }
 
-int hfsplus_rmdir(struct inode *dir, struct dentry *dentry)
+static int hfsplus_rmdir(struct inode *dir, struct dentry *dentry)
 {
        struct inode *inode;
        int res;
@@ -385,7 +386,8 @@ int hfsplus_rmdir(struct inode *dir, struct dentry *dentry)
        return 0;
 }
 
-int hfsplus_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
+static int hfsplus_symlink(struct inode *dir, struct dentry *dentry,
+                          const char *symname)
 {
        struct super_block *sb;
        struct inode *inode;
@@ -415,7 +417,8 @@ int hfsplus_symlink(struct inode *dir, struct dentry *dentry, const char *symnam
        return res;
 }
 
-int hfsplus_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
+static int hfsplus_mknod(struct inode *dir, struct dentry *dentry,
+                        int mode, dev_t rdev)
 {
        struct super_block *sb;
        struct inode *inode;
@@ -440,8 +443,8 @@ int hfsplus_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev
        return 0;
 }
 
-int hfsplus_rename(struct inode *old_dir, struct dentry *old_dentry,
-                  struct inode *new_dir, struct dentry *new_dentry)
+static int hfsplus_rename(struct inode *old_dir, struct dentry *old_dentry,
+                         struct inode *new_dir, struct dentry *new_dentry)
 {
        int res;