Skip to content

Commit ad10d60

Browse files
committed
umount_libmount: fix error messages
libmount based umount.nilfs2 does not display the node (target) correctly in its message on error as below: umount.nilfs2: (null): device is busy Fix this issue. Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
1 parent 15a99ec commit ad10d60

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

sbin/mount/umount_libmount.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,33 +170,33 @@ static void nilfs_umount_parse_options(int argc, char *argv[],
170170
}
171171
}
172172

173-
static void complain(int err, const char *dev)
173+
static void complain(int err, const char *node)
174174
{
175175
switch (err) {
176176
case ENXIO:
177-
error(_("%s: %s: invalid block device"), progname, dev);
177+
error(_("%s: %s: invalid block device"), progname, node);
178178
break;
179179
case EINVAL:
180-
error(_("%s: %s: not mounted"), progname, dev);
180+
error(_("%s: %s: not mounted"), progname, node);
181181
break;
182182
case EIO:
183-
error(_("%s: %s: I/O error while unmounting"), progname, dev);
183+
error(_("%s: %s: I/O error while unmounting"), progname, node);
184184
break;
185185
case EBUSY:
186-
error(_("%s: %s: device is busy"), progname, dev);
186+
error(_("%s: %s: target is busy"), progname, node);
187187
break;
188188
case ENOENT:
189-
error(_("%s: %s: not found"), progname, dev);
189+
error(_("%s: %s: not found"), progname, node);
190190
break;
191191
case EPERM:
192-
error(_("%s: %s: must be superuser to umount"), progname, dev);
192+
error(_("%s: %s: must be superuser to umount"), progname, node);
193193
break;
194194
case EACCES:
195195
error(_("%s: %s: block devices not permitted on fs"), progname,
196-
dev);
196+
node);
197197
break;
198198
default:
199-
error(_("%s: %s: %s"), progname, dev, strerror(err));
199+
error(_("%s: %s: %s"), progname, node, strerror(err));
200200
break;
201201
}
202202
}
@@ -282,7 +282,7 @@ static int nilfs_umount_one(struct nilfs_umount_info *umi)
282282
if (!mnt_context_is_fake(umi->cxt)) {
283283
res = nilfs_do_umount_one(umi);
284284
if (res) {
285-
complain(res, mnt_context_get_source(umi->cxt));
285+
complain(res, mnt_context_get_target(umi->cxt));
286286
goto failed;
287287
}
288288
}

0 commit comments

Comments
 (0)