Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 104237
b: refs/heads/master
c: 8ed0a52
h: refs/heads/master
i:
  104235: 0544f58
v: v3
  • Loading branch information
Neil Brown committed Jun 27, 2008
1 parent 43bd1dd commit 8d9e646
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1a0fd497733bd029a7d5f2e5c69b1dff715b7792
refs/heads/master: 8ed0a5216a0238f53b482ec88ce4aeed4b9f0da1
4 changes: 2 additions & 2 deletions trunk/drivers/md/md.c
Original file line number Diff line number Diff line change
Expand Up @@ -1984,7 +1984,7 @@ offset_store(mdk_rdev_t *rdev, const char *buf, size_t len)
unsigned long long offset = simple_strtoull(buf, &e, 10);
if (e==buf || (*e && *e != '\n'))
return -EINVAL;
if (rdev->mddev->pers)
if (rdev->mddev->pers && rdev->raid_disk >= 0)
return -EBUSY;
if (rdev->size && rdev->mddev->external)
/* Must set offset before size, so overlap checks
Expand Down Expand Up @@ -2023,7 +2023,7 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len)

if (e==buf || (*e && *e != '\n'))
return -EINVAL;
if (my_mddev->pers)
if (my_mddev->pers && rdev->raid_disk >= 0)
return -EBUSY;
rdev->size = size;
if (size > oldsize && rdev->mddev->external) {
Expand Down

0 comments on commit 8d9e646

Please sign in to comment.