diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-19 09:47:13 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-19 09:47:13 +0400 |
commit | 35a21b429917baf86d7595826e7314662ec09d0a (patch) | |
tree | b60e4451fe84fe113fbb98ef09733cd2071998bb /fs/btrfs/ctree.h | |
parent | 5c80c71b9a0ec518b4b58d2a61de01a04f4a4453 (diff) | |
parent | 910ac68a2b80c7de95bc8488734067b1bb15d583 (diff) | |
download | linux-35a21b429917baf86d7595826e7314662ec09d0a.tar.xz |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFSv4.1: Return NFS4ERR_BADSESSION to callbacks during session resets
NFSv4.1: Fix the callback 'highest_used_slotid' behaviour
pnfs-obj: Fix the comp_index != 0 case
pnfs-obj: Bug when we are running out of bio
nfs: add missing prefetch.h include
Diffstat (limited to 'fs/btrfs/ctree.h')
0 files changed, 0 insertions, 0 deletions