Commit 56eea20c authored by Tycho Andersen's avatar Tycho Andersen Committed by Pavel Emelyanov

unix: unlink_stale returns void

We don't check the return value here, so let's return void.
Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent d0f8f5e7
...@@ -1227,15 +1227,15 @@ static struct file_desc_ops unix_desc_ops = { ...@@ -1227,15 +1227,15 @@ static struct file_desc_ops unix_desc_ops = {
* Make FS clean from sockets we're about to * Make FS clean from sockets we're about to
* restore. See for how we bind them for details * restore. See for how we bind them for details
*/ */
static int unlink_stale(struct unix_sk_info *ui) static void unlink_stale(struct unix_sk_info *ui)
{ {
int ret, cwd_fd; int ret, cwd_fd;
if (ui->name[0] == '\0' || (ui->ue->uflags & USK_EXTERN)) if (ui->name[0] == '\0' || (ui->ue->uflags & USK_EXTERN))
return 0; return;
if (prep_unix_sk_cwd(ui, &cwd_fd)) if (prep_unix_sk_cwd(ui, &cwd_fd))
return -1; return;
ret = unlinkat(AT_FDCWD, ui->name, 0) ? -1 : 0; ret = unlinkat(AT_FDCWD, ui->name, 0) ? -1 : 0;
if (ret < 0) { if (ret < 0) {
...@@ -1245,8 +1245,6 @@ static int unlink_stale(struct unix_sk_info *ui) ...@@ -1245,8 +1245,6 @@ static int unlink_stale(struct unix_sk_info *ui)
ui->name_dir ? ui->name_dir : "-"); ui->name_dir ? ui->name_dir : "-");
} }
revert_unix_sk_cwd(&cwd_fd); revert_unix_sk_cwd(&cwd_fd);
return ret;
} }
static int collect_one_unixsk(void *o, ProtobufCMessage *base) static int collect_one_unixsk(void *o, ProtobufCMessage *base)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment