virtio_pci: optional MSI-X support

[safe/jmp/linux-2.6] / fs / minix / namei.c

diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index b25bca5..32b131c 100644 (file)
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -6,18 +6,6 @@
 
 #include "minix.h"
 
-static inline void inc_count(struct inode *inode)
-{
-       inode->i_nlink++;
-       mark_inode_dirty(inode);
-}
-
-static inline void dec_count(struct inode *inode)
-{
-       inode->i_nlink--;
-       mark_inode_dirty(inode);
-}
-
 static int add_nondir(struct dentry *dentry, struct inode *inode)
 {
        int err = minix_add_link(dentry, inode);
@@ -25,35 +13,11 @@ static int add_nondir(struct dentry *dentry, struct inode *inode)
                d_instantiate(dentry, inode);
                return 0;
        }
-       dec_count(inode);
+       inode_dec_link_count(inode);
        iput(inode);
        return err;
 }
 
-static int minix_hash(struct dentry *dentry, struct qstr *qstr)
-{
-       unsigned long hash;
-       int i;
-       const unsigned char *name;
-
-       i = minix_sb(dentry->d_inode->i_sb)->s_namelen;
-       if (i >= qstr->len)
-               return 0;
-       /* Truncate the name in place, avoids having to define a compare
-          function. */
-       qstr->len = i;
-       name = qstr->name;
-       hash = init_name_hash();
-       while (i--)
-               hash = partial_name_hash(*name++, hash);
-       qstr->hash = end_name_hash(hash);
-       return 0;
-}
-
-struct dentry_operations minix_dentry_operations = {
-       .d_hash         = minix_hash,
-};
-
 static struct dentry *minix_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)
 {
        struct inode * inode = NULL;
@@ -66,10 +30,9 @@ static struct dentry *minix_lookup(struct inode * dir, struct dentry *dentry, st
 
        ino = minix_inode_by_name(dentry);
        if (ino) {
-               inode = iget(dir->i_sb, ino);
- 
-               if (!inode)
-                       return ERR_PTR(-EACCES);
+               inode = minix_iget(dir->i_sb, ino);
+               if (IS_ERR(inode))
+                       return ERR_CAST(inode);
        }
        d_add(dentry, inode);
        return NULL;
@@ -125,7 +88,7 @@ out:
        return err;
 
 out_fail:
-       dec_count(inode);
+       inode_dec_link_count(inode);
        iput(inode);
        goto out;
 }
@@ -139,7 +102,7 @@ static int minix_link(struct dentry * old_dentry, struct inode * dir,
                return -EMLINK;
 
        inode->i_ctime = CURRENT_TIME_SEC;
-       inc_count(inode);
+       inode_inc_link_count(inode);
        atomic_inc(&inode->i_count);
        return add_nondir(dentry, inode);
 }
@@ -152,7 +115,7 @@ static int minix_mkdir(struct inode * dir, struct dentry *dentry, int mode)
        if (dir->i_nlink >= minix_sb(dir->i_sb)->s_link_max)
                goto out;
 
-       inc_count(dir);
+       inode_inc_link_count(dir);
 
        inode = minix_new_inode(dir, &err);
        if (!inode)
@@ -163,7 +126,7 @@ static int minix_mkdir(struct inode * dir, struct dentry *dentry, int mode)
                inode->i_mode |= S_ISGID;
        minix_set_inode(inode, 0);
 
-       inc_count(inode);
+       inode_inc_link_count(inode);
 
        err = minix_make_empty(inode, dir);
        if (err)
@@ -178,11 +141,11 @@ out:
        return err;
 
 out_fail:
-       dec_count(inode);
-       dec_count(inode);
+       inode_dec_link_count(inode);
+       inode_dec_link_count(inode);
        iput(inode);
 out_dir:
-       dec_count(dir);
+       inode_dec_link_count(dir);
        goto out;
 }
 
@@ -202,7 +165,7 @@ static int minix_unlink(struct inode * dir, struct dentry *dentry)
                goto end_unlink;
 
        inode->i_ctime = dir->i_ctime;
-       dec_count(inode);
+       inode_dec_link_count(inode);
 end_unlink:
        return err;
 }
@@ -215,8 +178,8 @@ static int minix_rmdir(struct inode * dir, struct dentry *dentry)
        if (minix_empty_dir(inode)) {
                err = minix_unlink(dir, dentry);
                if (!err) {
-                       dec_count(dir);
-                       dec_count(inode);
+                       inode_dec_link_count(dir);
+                       inode_dec_link_count(inode);
                }
        }
        return err;
@@ -257,34 +220,34 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
                new_de = minix_find_entry(new_dentry, &new_page);
                if (!new_de)
                        goto out_dir;
-               inc_count(old_inode);
+               inode_inc_link_count(old_inode);
                minix_set_link(new_de, new_page, old_inode);
                new_inode->i_ctime = CURRENT_TIME_SEC;
                if (dir_de)
-                       new_inode->i_nlink--;
-               dec_count(new_inode);
+                       drop_nlink(new_inode);
+               inode_dec_link_count(new_inode);
        } else {
                if (dir_de) {
                        err = -EMLINK;
                        if (new_dir->i_nlink >= info->s_link_max)
                                goto out_dir;
                }
-               inc_count(old_inode);
+               inode_inc_link_count(old_inode);
                err = minix_add_link(new_dentry, old_inode);
                if (err) {
-                       dec_count(old_inode);
+                       inode_dec_link_count(old_inode);
                        goto out_dir;
                }
                if (dir_de)
-                       inc_count(new_dir);
+                       inode_inc_link_count(new_dir);
        }
 
        minix_delete_entry(old_de, old_page);
-       dec_count(old_inode);
+       inode_dec_link_count(old_inode);
 
        if (dir_de) {
                minix_set_link(dir_de, dir_page, new_dir);
-               dec_count(old_dir);
+               inode_dec_link_count(old_dir);
        }
        return 0;
 
@@ -303,7 +266,7 @@ out:
 /*
  * directories can handle most operations...
  */
-struct inode_operations minix_dir_inode_operations = {
+const struct inode_operations minix_dir_inode_operations = {
        .create         = minix_create,
        .lookup         = minix_lookup,
        .link           = minix_link,