Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd

2 files changed, 1 insertions, 5 deletions

diff --git a/libdiskfs/io-pathconf.c b/libdiskfs/io-pathconf.c
index bb192fe3..38e277c3 100644
--- a/libdiskfs/io-pathconf.c
+++ b/libdiskfs/io-pathconf.c
@@ -72,10 +72,6 @@ diskfs_S_io_pathconf (struct protid *cred,
       *value = 32;
       break;
 
-    case _PC_2_SYMLINKS:
-      *value = diskfs_shortcut_symlink ? 1 : 0;
-      break;
-
     default:
       return EINVAL;
     }
diff --git a/libps/ps.h b/libps/ps.h
index 91fdc70b..bcc43f8b 100644
--- a/libps/ps.h
+++ b/libps/ps.h
@@ -454,7 +454,7 @@ extern char *proc_stat_state_tags;
 
 /* Returns in PS a new proc_stat for the process PID in the ps context PC.
    If a memory allocation error occurs, ENOMEM is returned, otherwise 0.
-   Users shouldn't use this routine, use pc_context_find_proc_stat instead.  */
+   Users shouldn't use this routine, use ps_context_find_proc_stat instead.  */
 error_t _proc_stat_create (pid_t pid, struct ps_context *context,
 			   struct proc_stat **ps);