diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-03-19 12:01:28 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-03-19 12:01:28 +0800 |
| commit | 06eb38abaf83b589a5e66ca4749eee16fa0d9854 (patch) | |
| tree | 6aa3240c439286123a9545bdaa1f5c1f1a768264 /fs | |
| parent | 0bdf4ea52af04501c69799babfdd0b38cbf0299e (diff) | |
| parent | b8ea1f9b32599d3cc0ce81636d3842aee2ce302b (diff) | |
Merge tag 'v4.4.122' into linux-linaro-lsk-v4.4
This is the 4.4.122 stable release
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/xattr.c | 3 | ||||
| -rw-r--r-- | fs/nfs/direct.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 7c23363ecf19..8d661b3c47b6 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -828,8 +828,6 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, if (!IS_LAST_ENTRY(s->first)) ext4_xattr_rehash(header(s->base), s->here); - ext4_xattr_cache_insert(ext4_mb_cache, - bs->bh); } unlock_buffer(bs->bh); if (error == -EFSCORRUPTED) @@ -918,6 +916,7 @@ inserted: } else if (bs->bh && s->base == bs->bh->b_data) { /* We were modifying this block in-place. */ ea_bdebug(bs->bh, "keeping this block"); + ext4_xattr_cache_insert(ext4_mb_cache, bs->bh); new_bh = bs->bh; get_bh(new_bh); } else { diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 5fd3cf54b2b3..211440722e24 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -86,9 +86,9 @@ struct nfs_direct_req { struct nfs_direct_mirror mirrors[NFS_PAGEIO_DESCRIPTOR_MIRROR_MAX]; int mirror_count; + loff_t io_start; /* Start offset for I/O */ ssize_t count, /* bytes actually processed */ bytes_left, /* bytes left to be sent */ - io_start, /* start of IO */ error; /* any reported error */ struct completion completion; /* wait for i/o completion */ |