Skip to contentSkip to conversation

Fix bd_claim() error code.

PATCH New Rob Landley 1 participant 1 message Sep 17, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix bd_claim() error code.

Problem: In some circumstances, bd_claim() is returning the wrong error code.

If we try to swapon an unused block device that isn't swap formatted, we get -EINVAL. But if that same block device is already mounted, we instead get -EBUSY, even though it still isn't a valid swap device.

This issue came up on the busybox list trying to get the error message from "swapon -a" right. If a swap device is already enabled, we get -EBUSY, and we shouldn't report this as an error. But we can't distinguish the two -EBUSY conditions, which are very different errors.

In the code, bd_claim() returns either 0 or -EBUSY, but in this case busy means "somebody other than sys_swapon has already claimed this", and _that_ means this block device can't be a valid swap device. So return -EINVAL there.

mm/swapfile.c 2005-09-17 02:42:45.000000000 -0500 renamed from mm/swapfile.c 2005-09-09 21:42:58.000000000 -0500 +1 -0
@@ -1358,6 +1358,7 @@
   error = bd_claim(bdev, sys_swapon);
   if (error < 0) {
    bdev = NULL;
+   error = -EINVAL;
    goto bad_swap;
   }
   p->old_block_size = block_size(bdev);