Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751725Ab3CBHO5 (ORCPT ); Sat, 2 Mar 2013 02:14:57 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:40195 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750819Ab3CBHOz (ORCPT ); Sat, 2 Mar 2013 02:14:55 -0500 From: Jerry Snitselaar To: linux-btrfs@vger.kernel.org Cc: chris.mason@fusionio.com, dsterba@suse.cz, linux-kernel@vger.kernel.org Subject: [PATCH] btrfs: return EPERM in btrfs_rm_device() Date: Sat, 2 Mar 2013 00:13:59 -0700 Message-Id: <1362208439-19245-1-git-send-email-jerry.snitselaar@oracle.com> X-Mailer: git-send-email 1.8.2.rc1 X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1766 Lines: 56 Currently there are error paths in btrfs_rm_device() where EINVAL is returned telling the user they passed an invalid argument even though they passed a valid device. Change to return EPERM instead as the operation is not permitted. Signed-off-by: Jerry Snitselaar --- fs/btrfs/volumes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 5cbb7f4..3e1586c 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1392,14 +1392,14 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) if ((all_avail & BTRFS_BLOCK_GROUP_RAID10) && num_devices <= 4) { printk(KERN_ERR "btrfs: unable to go below four devices " "on raid10\n"); - ret = -EINVAL; + ret = -EPERM; goto out; } if ((all_avail & BTRFS_BLOCK_GROUP_RAID1) && num_devices <= 2) { printk(KERN_ERR "btrfs: unable to go below two " "devices on raid1\n"); - ret = -EINVAL; + ret = -EPERM; goto out; } @@ -1449,14 +1449,14 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) if (device->is_tgtdev_for_dev_replace) { pr_err("btrfs: unable to remove the dev_replace target dev\n"); - ret = -EINVAL; + ret = -EPERM; goto error_brelse; } if (device->writeable && root->fs_info->fs_devices->rw_devices == 1) { printk(KERN_ERR "btrfs: unable to remove the only writeable " "device\n"); - ret = -EINVAL; + ret = -EPERM; goto error_brelse; } -- 1.8.2.rc1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/