diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-02-11 11:45:54 -0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-02-11 11:45:54 -0200 |
| commit | 7c940c18c57e45910f7dd9a4011c4658cacba4b6 (patch) | |
| tree | d161ba063e2c959984f7a7126c3ed3be2a595d70 /fs/cifs/file.c | |
| parent | d5e3d747007fdb541e57ed72e020ff0b94db3470 (diff) | |
| parent | 401b8e1317d288f28d6e1afd13271dcb08fd9869 (diff) | |
| download | kernel_samsung_aries-7c940c18c57e45910f7dd9a4011c4658cacba4b6.zip kernel_samsung_aries-7c940c18c57e45910f7dd9a4011c4658cacba4b6.tar.gz kernel_samsung_aries-7c940c18c57e45910f7dd9a4011c4658cacba4b6.tar.bz2 | |
Merge remote branch 'acme/perf/urgent' into perf/core
Fixups due to rename of event_t routines from event__ to perf_event__
done in perf/core.
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/event.c
tools/perf/util/event.h
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 74c0a28..e964b1c 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1662,10 +1662,10 @@ static ssize_t cifs_iovec_write(struct file *file, const struct iovec *iov, unsigned long nr_segs, loff_t *poffset) { - size_t total_written = 0; - unsigned int written = 0; - unsigned long num_pages, npages; - size_t copied, len, cur_len, i; + unsigned int written; + unsigned long num_pages, npages, i; + size_t copied, len, cur_len; + ssize_t total_written = 0; struct kvec *to_send; struct page **pages; struct iov_iter it; @@ -1821,7 +1821,8 @@ cifs_iovec_read(struct file *file, const struct iovec *iov, { int rc; int xid; - unsigned int total_read, bytes_read = 0; + ssize_t total_read; + unsigned int bytes_read = 0; size_t len, cur_len; int iov_offset = 0; struct cifs_sb_info *cifs_sb; |