diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-08-30 14:26:36 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-08-30 14:26:36 -0400 |
| commit | 6d372b61d60461c62891c426001ee21e4fe9869b (patch) | |
| tree | 728978a491b8d7a7a63030ac28cb1f71486107cf /fs | |
| parent | 27770766f5425b466d3a61025350f9829840e5e9 (diff) | |
| parent | 5aa287dcf1b5879aa0150b0511833c52885f5b4c (diff) | |
Merge tag 'v3.0.42' into v3.0-rt
This is the 3.0.42 stable release
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/super.c | 1 | ||||
| -rw-r--r-- | fs/fuse/file.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 113b10768445..489d406c0d7c 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -860,6 +860,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb) ei->i_reserved_meta_blocks = 0; ei->i_allocated_meta_blocks = 0; ei->i_da_metadata_calc_len = 0; + ei->i_da_metadata_calc_last_lblock = 0; spin_lock_init(&(ei->i_block_reservation_lock)); #ifdef CONFIG_QUOTA ei->i_reserved_quota = 0; diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 82a66466a24c..79fca8dfa3ea 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1710,7 +1710,7 @@ static int fuse_verify_ioctl_iov(struct iovec *iov, size_t count) size_t n; u32 max = FUSE_MAX_PAGES_PER_REQ << PAGE_SHIFT; - for (n = 0; n < count; n++) { + for (n = 0; n < count; n++, iov++) { if (iov->iov_len > (size_t) max) return -ENOMEM; max -= iov->iov_len; |