diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index 3e5fc1a2c82f..53e58c3f2121 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -973,7 +973,7 @@ static loff_t pvfs2_file_llseek(struct file *file, loff_t offset, int origin)
  */
 static int pvfs2_lock(struct file *filp, int cmd, struct file_lock *fl)
 {
-	int rc = -ENOLCK;
+	int rc = -EINVAL;
 
 	if (PVFS2_SB(filp->f_inode->i_sb)->flags & PVFS2_OPT_LOCAL_LOCK) {
 		if (cmd == F_GETLK) {
diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c
index 747fe6a690af..05f6feadfd0d 100644
--- a/fs/orangefs/namei.c
+++ b/fs/orangefs/namei.c
@@ -243,28 +243,24 @@ static int pvfs2_unlink(struct inode *dir, struct dentry *dentry)
 }
 
 /*
- * pvfs2_link() is only implemented here to make sure that we return a
- * reasonable error code (the kernel will return a misleading EPERM
- * otherwise).  PVFS2 does not support hard links.
+ * PVFS2 does not support hard links.
  */
 static int pvfs2_link(struct dentry *old_dentry,
 		      struct inode *dir,
 		      struct dentry *dentry)
 {
-	return -EOPNOTSUPP;
+	return -EPERM;
 }
 
 /*
- * pvfs2_mknod() is only implemented here to make sure that we return a
- * reasonable error code (the kernel will return a misleading EPERM
- * otherwise).  PVFS2 does not support special files such as fifos or devices.
+ * PVFS2 does not support special files.
  */
 static int pvfs2_mknod(struct inode *dir,
 		       struct dentry *dentry,
 		       umode_t mode,
 		       dev_t rdev)
 {
-	return -EOPNOTSUPP;
+	return -EPERM;
 }
 
 static int pvfs2_symlink(struct inode *dir,