diff --git a/[refs] b/[refs] index 7a4d3a377a51..4bb7550cc567 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c67e5382fb3f312c95d8d01db40fb398e6da454d +refs/heads/master: a1d494495c69ef0810cd008f59310d2b9db28e36 diff --git a/trunk/fs/pipe.c b/trunk/fs/pipe.c index fec5e4ad071a..95ebb56de494 100644 --- a/trunk/fs/pipe.c +++ b/trunk/fs/pipe.c @@ -693,7 +693,7 @@ static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) return put_user(count, (int __user *)arg); default: - return -EINVAL; + return -ENOIOCTLCMD; } }