diff options
Diffstat (limited to 'fs')
128 files changed, 4631 insertions, 6014 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index cef58445111..378acdafa35 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1751,7 +1751,7 @@ cifs_iovec_read(struct file *file, const struct iovec *iov, io_parms.pid = pid; io_parms.tcon = pTcon; io_parms.offset = *poffset; - io_parms.length = len; + io_parms.length = cur_len; rc = CIFSSMBRead(xid, &io_parms, &bytes_read, &read_data, &buf_type); pSMBr = (struct smb_com_read_rsp *)read_data; diff --git a/fs/dcache.c b/fs/dcache.c index 3c34ac0e9a1..be18598c7fd 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1735,8 +1735,6 @@ seqretry: tname = dentry->d_name.name; i = dentry->d_inode; prefetch(tname); - if (i) - prefetch(i); /* * This seqcount check is required to ensure name and * len are loaded atomically, so as not to walk off the diff --git a/fs/dl |