diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-22 20:53:40 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-22 20:53:40 +0400 |
| commit | af36d15f58a3560617f1497ae011c3192049e40e (patch) | |
| tree | f754dd93f4b14745c5e7b8caf52349716f7f7652 /fs/nfs/read.c | |
| parent | 8ba8ed54de4dd79bb88ab6cd7dbf2e83d58d6d57 (diff) | |
| parent | 24a70313969fc3fc440216b40babdb42564acff3 (diff) | |
| download | linux-af36d15f58a3560617f1497ae011c3192049e40e.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: remove free-space-cache.c WARN during log replay
Btrfs: sectorsize align offsets in fiemap
Btrfs: clear pages dirty for io and set them extent mapped
Btrfs: wait on caching if we're loading the free space cache
Btrfs: prefix resize related printks with btrfs:
btrfs: fix stat blocks accounting
Btrfs: avoid unnecessary bitmap search for cluster setup
Btrfs: fix to search one more bitmap for cluster setup
btrfs: mirror_num should be int, not u64
btrfs: Fix up 32/64-bit compatibility for new ioctls
Btrfs: fix barrier flushes
Btrfs: fix tree corruption after multi-thread snapshots and inode_cache flush
Diffstat (limited to 'fs/nfs/read.c')
0 files changed, 0 insertions, 0 deletions