diff --git a/[refs] b/[refs] index acd92816cbc4..66fc5eceb175 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4006553b06306b34054529477b06b68a1c66249b +refs/heads/master: 99829b832997d907c30669bfd17da32151e18f04 diff --git a/trunk/fs/anon_inodes.c b/trunk/fs/anon_inodes.c index 1a4eee620b0d..3662dd44896b 100644 --- a/trunk/fs/anon_inodes.c +++ b/trunk/fs/anon_inodes.c @@ -116,7 +116,7 @@ int anon_inode_getfd(const char *name, const struct file_operations *fops, file->f_mapping = anon_inode_inode->i_mapping; file->f_pos = 0; - file->f_flags = O_RDWR; + file->f_flags = O_RDWR | (flags & O_NONBLOCK); file->f_version = 0; file->private_data = priv;