Inotify: undefined reference to `anon_inode_getfd'

[safe/jmp/linux-2.6] / fs / jfs / jfs_inode.c

diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
index 70022fd..829921b 100644 (file)
--- a/fs/jfs/jfs_inode.c
+++ b/fs/jfs/jfs_inode.c
@@ -79,7 +79,8 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
        inode = new_inode(sb);
        if (!inode) {
                jfs_warn("ialloc: new_inode returned NULL!");
-               return ERR_PTR(-ENOMEM);
+               rc = -ENOMEM;
+               goto fail;
        }
 
        jfs_inode = JFS_IP(inode);
@@ -89,8 +90,12 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
                jfs_warn("ialloc: diAlloc returned %d!", rc);
                if (rc == -EIO)
                        make_bad_inode(inode);
-               iput(inode);
-               return ERR_PTR(rc);
+               goto fail_put;
+       }
+
+       if (insert_inode_locked(inode) < 0) {
+               rc = -EINVAL;
+               goto fail_unlock;
        }
 
        inode->i_uid = current_fsuid();
@@ -111,13 +116,10 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
        /*
         * Allocate inode to quota.
         */
-       if (DQUOT_ALLOC_INODE(inode)) {
-               DQUOT_DROP(inode);
-               inode->i_flags |= S_NOQUOTA;
-               inode->i_nlink = 0;
-               iput(inode);
-               return ERR_PTR(-EDQUOT);
-       }
+       dquot_initialize(inode);
+       rc = dquot_alloc_inode(inode);
+       if (rc)
+               goto fail_drop;
 
        inode->i_mode = mode;
        /* inherit flags from parent */
@@ -158,4 +160,15 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
        jfs_info("ialloc returns inode = 0x%p\n", inode);
 
        return inode;
+
+fail_drop:
+       dquot_drop(inode);
+       inode->i_flags |= S_NOQUOTA;
+fail_unlock:
+       inode->i_nlink = 0;
+       unlock_new_inode(inode);
+fail_put:
+       iput(inode);
+fail:
+       return ERR_PTR(rc);
 }