diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /drivers/mtd/ubi/eba.c | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/mtd/ubi/eba.c')
| -rw-r--r-- | drivers/mtd/ubi/eba.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index 3dba5733ed1f..74002945b71b 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c | |||
| @@ -940,9 +940,6 @@ static void ltree_entry_ctor(void *obj, struct kmem_cache *cache, | |||
| 940 | { | 940 | { |
| 941 | struct ltree_entry *le = obj; | 941 | struct ltree_entry *le = obj; |
| 942 | 942 | ||
| 943 | if (flags & SLAB_CTOR_CONSTRUCTOR) | ||
| 944 | return; | ||
| 945 | |||
| 946 | le->users = 0; | 943 | le->users = 0; |
| 947 | init_rwsem(&le->mutex); | 944 | init_rwsem(&le->mutex); |
| 948 | } | 945 | } |