diff options
| author | Namhyung Kim <namhyung@gmail.com> | 2010-10-26 14:21:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 16:52:09 -0700 |
| commit | 0116651c85e671a693dd2f56e95dd651f746c973 (patch) | |
| tree | d09f274105bc756b5fbd09dcb55302c0191e7e74 /mm | |
| parent | 68da336a14e16c2de95e987f3200995b707d7038 (diff) | |
| download | linux-stable-0116651c85e671a693dd2f56e95dd651f746c973.tar.gz linux-stable-0116651c85e671a693dd2f56e95dd651f746c973.tar.bz2 linux-stable-0116651c85e671a693dd2f56e95dd651f746c973.zip | |
mm: remove temporary variable on generic_file_direct_write()
'end' shadows earlier one and is not necessary at all. Remove it and use
'pos' instead. This removes following sparse warnings:
mm/filemap.c:2180:24: warning: symbol 'end' shadows an earlier one
mm/filemap.c:2132:25: originally declared here
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 33f81252a744..75572b5f2374 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2193,12 +2193,12 @@ generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov, } if (written > 0) { - loff_t end = pos + written; - if (end > i_size_read(inode) && !S_ISBLK(inode->i_mode)) { - i_size_write(inode, end); + pos += written; + if (pos > i_size_read(inode) && !S_ISBLK(inode->i_mode)) { + i_size_write(inode, pos); mark_inode_dirty(inode); } - *ppos = end; + *ppos = pos; } out: return written; |