+ selftests-filesystems-assume-that-tiocgptpeer-is-defined.patch added to mm-nonmm-unstable branch

+ selftests-filesystems-assume-that-tiocgptpeer-is-defined.patch added to mm-nonmm-unstable branch

[Andrew Morton]

The patch titled
     Subject: selftests/filesystems: assume that TIOCGPTPEER is defined
has been added to the -mm mm-nonmm-unstable branch.  Its filename is
     selftests-filesystems-assume-that-tiocgptpeer-is-defined.patch

This patch will shortly appear at
     https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/selftests-filesystems-assume-that-tiocgptpeer-is-defined.patch

This patch will later appear in the mm-nonmm-unstable branch at
    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next via various
branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there most days

------------------------------------------------------
From: Mark Brown <broonie@kernel.org>
Subject: selftests/filesystems: assume that TIOCGPTPEER is defined
Date: Fri, 27 Feb 2026 15:20:35 +0000

The devpts_pts selftest has an ifdef in case an architecture does not
define TIOCGPTPEER, but the handling for this is broken since we need
errno to be set to EINVAL in order to skip the test as we should.  Given
that this ioctl() has been defined since v4.15 we may as well just assume
it's there rather than write handling code which will probably never get
used.

Link: https://lkml.kernel.org/r/20260227-selftests-filesystems-devpts-tiocgptpeer-v3-1-07db4d85d5aa@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 tools/testing/selftests/filesystems/devpts_pts.c |    2 --
 1 file changed, 2 deletions(-)

--- a/tools/testing/selftests/filesystems/devpts_pts.c~selftests-filesystems-assume-that-tiocgptpeer-is-defined
+++ a/tools/testing/selftests/filesystems/devpts_pts.c
@@ -119,9 +119,7 @@ static int do_tiocgptpeer(char *ptmx, ch
 		goto do_cleanup;
 	}
 
-#ifdef TIOCGPTPEER
 	slave = ioctl(master, TIOCGPTPEER, O_RDWR | O_NOCTTY | O_CLOEXEC);
-#endif
 	if (slave < 0) {
 		if (errno == EINVAL) {
 			fprintf(stderr, "TIOCGPTPEER is not supported. "
_

Patches currently in -mm which might be from broonie@kernel.org are

selftests-filesystems-assume-that-tiocgptpeer-is-defined.patch