udf: replace inode uid,gid,mode init with helper

[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 7762f33..2686531 100644 (file)
--- a/fs/jfs/jfs_inode.c
+++ b/fs/jfs/jfs_inode.c
@@ -98,14 +98,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
                goto fail_unlock;
        }
 
-       inode->i_uid = current_fsuid();
-       if (parent->i_mode & S_ISGID) {
-               inode->i_gid = parent->i_gid;
-               if (S_ISDIR(mode))
-                       mode |= S_ISGID;
-       } else
-               inode->i_gid = current_fsgid();
-
+       inode_init_owner(inode, parent, mode);
        /*
         * New inodes need to save sane values on disk when
         * uid & gid mount options are used
@@ -116,12 +109,11 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
        /*
         * Allocate inode to quota.
         */
-       vfs_dq_init(inode);
+       dquot_initialize(inode);
        rc = dquot_alloc_inode(inode);
        if (rc)
                goto fail_drop;
 
-       inode->i_mode = mode;
        /* inherit flags from parent */
        jfs_inode->mode2 = JFS_IP(parent)->mode2 & JFS_FL_INHERIT;
 
@@ -134,7 +126,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
                if (S_ISLNK(mode))
                        jfs_inode->mode2 &= ~(JFS_IMMUTABLE_FL|JFS_APPEND_FL);
        }
-       jfs_inode->mode2 |= mode;
+       jfs_inode->mode2 |= inode->i_mode;
 
        inode->i_blocks = 0;
        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
@@ -162,7 +154,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
        return inode;
 
 fail_drop:
-       vfs_dq_drop(inode);
+       dquot_drop(inode);
        inode->i_flags |= S_NOQUOTA;
 fail_unlock:
        inode->i_nlink = 0;