vserver 1.9.5.x5

[linux-2.6.git] / fs / ufs / namei.c

diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index 2fbba03..2958cde 100644 (file)
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -30,6 +30,7 @@
 #include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
 #include "swab.h"      /* will go away - see comment in mknod() */
+#include "util.h"
 
 /*
 #undef UFS_NAMEI_DEBUG
@@ -125,8 +126,7 @@ static int ufs_mknod (struct inode * dir, struct dentry *dentry, int mode, dev_t
        if (!IS_ERR(inode)) {
                init_special_inode(inode, mode, rdev);
                /* NOTE: that'll go when we get wide dev_t */
-               UFS_I(inode)->i_u1.i_data[0] = cpu_to_fs32(inode->i_sb,
-                                                       old_encode_dev(rdev));
+               ufs_set_inode_dev(inode->i_sb, UFS_I(inode), rdev);
                mark_inode_dirty(inode);
                lock_kernel();
                err = ufs_add_nondir(dentry, inode);
@@ -190,7 +190,7 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,
                return -EMLINK;
        }
 
-       inode->i_ctime = CURRENT_TIME;
+       inode->i_ctime = CURRENT_TIME_SEC;
        ufs_inc_count(inode);
        atomic_inc(&inode->i_count);
 
@@ -321,7 +321,7 @@ static int ufs_rename (struct inode * old_dir, struct dentry * old_dentry,
                        goto out_dir;
                ufs_inc_count(old_inode);
                ufs_set_link(new_dir, new_de, new_bh, old_inode);
-               new_inode->i_ctime = CURRENT_TIME;
+               new_inode->i_ctime = CURRENT_TIME_SEC;
                if (dir_de)
                        new_inode->i_nlink--;
                ufs_dec_count(new_inode);