X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=fs%2Fread_write.c;h=34b1bf259efd239d5380282b689258285711fc5e;hb=5d5d7727a8cde78f798ecf04bac8031eff536f9d;hp=df3468a22fea498889a5af4523556439d9f880bf;hpb=5c3eee79128c372a81a83665be2332a000944280;p=karo-tx-linux.git diff --git a/fs/read_write.c b/fs/read_write.c index df3468a22fea..34b1bf259efd 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -33,7 +33,7 @@ loff_t generic_file_llseek(struct file *file, loff_t offset, int origin) long long retval; struct inode *inode = file->f_mapping->host; - down(&inode->i_sem); + mutex_lock(&inode->i_mutex); switch (origin) { case 2: offset += inode->i_size; @@ -49,7 +49,7 @@ loff_t generic_file_llseek(struct file *file, loff_t offset, int origin) } retval = offset; } - up(&inode->i_sem); + mutex_unlock(&inode->i_mutex); return retval; } @@ -470,7 +470,7 @@ static ssize_t do_readv_writev(int type, struct file *file, * verify all the pointers */ ret = -EINVAL; - if ((nr_segs > UIO_MAXIOV) || (nr_segs <= 0)) + if (nr_segs > UIO_MAXIOV) goto out; if (!file->f_op) goto out;