summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 17:53:00 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 17:53:00 +0200
commit0ee40c6628434f0535da31deeacc28b61e80d810 (patch)
tree2873b9c932a63943fad22617b8385866e45347f5 /fs
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.15 (diff)
parent[PATCH] fix try_module_get race in elevator_find (diff)
downloadlinux-0ee40c6628434f0535da31deeacc28b61e80d810.tar.xz
linux-0ee40c6628434f0535da31deeacc28b61e80d810.zip
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'fs')
-rw-r--r--fs/partitions/check.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 77e178f13162..1e848648a322 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -430,7 +430,7 @@ void del_gendisk(struct gendisk *disk)
disk->flags &= ~GENHD_FL_UP;
unlink_gendisk(disk);
disk_stat_set_all(disk, 0);
- disk->stamp = disk->stamp_idle = 0;
+ disk->stamp = 0;
devfs_remove_disk(disk);