From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Wilck Subject: [PATCH 3/8] libmultipath: cciss_ioctl_pathinfo doesn't fail Date: Wed, 10 Oct 2018 22:05:01 +0200 Message-ID: <20181010200506.15796-4-mwilck@suse.com> References: <20181010200506.15796-1-mwilck@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20181010200506.15796-1-mwilck@suse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com To: Christophe Varoqui Cc: dm-devel@redhat.com, Martin Wilck List-Id: dm-devel.ids Make it a void function and move the DI_SERIAL test to pathinfo(). Signed-off-by: Martin Wilck --- libmultipath/discovery.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c index 8381d982..873035e5 100644 --- a/libmultipath/discovery.c +++ b/libmultipath/discovery.c @@ -1538,14 +1538,11 @@ scsi_ioctl_pathinfo (struct path * pp, struct config *conf, int mask) return; } -static int -cciss_ioctl_pathinfo (struct path * pp, int mask) +static void +cciss_ioctl_pathinfo(struct path *pp) { - if (mask & DI_SERIAL) { - get_serial(pp->serial, SERIAL_SIZE, pp->fd); - condlog(3, "%s: serial = %s", pp->dev, pp->serial); - } - return 0; + get_serial(pp->serial, SERIAL_SIZE, pp->fd); + condlog(3, "%s: serial = %s", pp->dev, pp->serial); } int @@ -1940,9 +1937,8 @@ int pathinfo(struct path *pp, struct config *conf, int mask) if (path_state == PATH_UP && pp->bus == SYSFS_BUS_SCSI) scsi_ioctl_pathinfo(pp, conf, mask); - if (pp->bus == SYSFS_BUS_CCISS && - cciss_ioctl_pathinfo(pp, mask)) - goto blank; + if (pp->bus == SYSFS_BUS_CCISS && mask & DI_SERIAL) + cciss_ioctl_pathinfo(pp); if (mask & DI_CHECKER) { if (path_state == PATH_UP) { -- 2.19.0