vserver 1.9.5.x5

[linux-2.6.git] / fs / sysv / itree.c

diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c
index 49d945c..86f5f8d 100644 (file)
--- a/fs/sysv/itree.c
+++ b/fs/sysv/itree.c
@@ -61,7 +61,7 @@ typedef struct {
        struct buffer_head *bh;
 } Indirect;
 
-static rwlock_t pointers_lock = RW_LOCK_UNLOCKED;
+static DEFINE_RWLOCK(pointers_lock);
 
 static inline void add_chain(Indirect *p, struct buffer_head *bh, sysv_zone_t *v)
 {
@@ -178,7 +178,7 @@ static inline int splice_branch(struct inode *inode,
        *where->p = where->key;
        write_unlock(&pointers_lock);
 
-       inode->i_ctime = CURRENT_TIME;
+       inode->i_ctime = CURRENT_TIME_SEC;
 
        /* had we spliced it onto indirect block? */
        if (where->bh)
@@ -418,7 +418,7 @@ do_indirects:
                }
                n++;
        }
-       inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+       inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC;
        if (IS_SYNC(inode))
                sysv_sync_inode (inode);
        else