diff --git a/[refs] b/[refs] index c7672b529c0c..a7ac7642e718 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f50fff4dace23d3cfeb195d5cd4ee813cee68b7 +refs/heads/master: 46ce341b2f176c2611f12ac390adf862e932eb02 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; } }