git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
fs
/
minix
/
itree_common.c
diff --git
a/fs/minix/itree_common.c
b/fs/minix/itree_common.c
index
5a4b51d
..
429baf8
100644
(file)
--- a/
fs/minix/itree_common.c
+++ b/
fs/minix/itree_common.c
@@
-6,7
+6,7
@@
typedef struct {
struct buffer_head *bh;
} Indirect;
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, block_t *v)
{
static inline void add_chain(Indirect *p, struct buffer_head *bh, block_t *v)
{
@@
-124,7
+124,7
@@
static inline int splice_branch(struct inode *inode,
/* We are done with atomic stuff, now do the rest of housekeeping */
/* We are done with atomic stuff, now do the rest of housekeeping */
- inode->i_ctime = CURRENT_TIME;
+ inode->i_ctime = CURRENT_TIME
_SEC
;
/* had we spliced it onto indirect block? */
if (where->bh)
/* had we spliced it onto indirect block? */
if (where->bh)
@@
-342,7
+342,7
@@
do_indirects:
}
first_whole++;
}
}
first_whole++;
}
- inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+ inode->i_mtime = inode->i_ctime = CURRENT_TIME
_SEC
;
mark_inode_dirty(inode);
}
mark_inode_dirty(inode);
}