diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-23 07:47:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-23 07:47:38 +0200 |
| commit | 344ba37bdc299660e1b1693b6999e5fe116893e1 (patch) | |
| tree | eaff91d98d4b0d889e25c8201673c4dbaf6e627b /fs/ext4/super.c | |
| parent | Merge tag 'regmap-fix-mmio' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | NFSv4: Fix the return value for nfs_callback_start_svc (diff) | |
| download | linux-344ba37bdc299660e1b1693b6999e5fe116893e1.tar.xz linux-344ba37bdc299660e1b1693b6999e5fe116893e1.zip | |
Merge tag 'nfs-for-3.7-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes from Trond Myklebust:
- Do not call pnfs_return_layout() from an rpciod context
- nfs4_ds_disconnect can cause Oopses. Kill it...
- Fix the return value for nfs_callback_start_svc
- Fix a number of compile warnings
* tag 'nfs-for-3.7-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFSv4: Fix the return value for nfs_callback_start_svc
NFSv4.1: Declare osd_pri_2_pnfs_err(), objio_init_read/write to be static
NFSv4: fs/nfs/nfs4getroot.c needs to include "internal.h"
NFSv4.1: Use kcalloc() to allocate zeroed arrays instead of kzalloc()
NFSv4.1: Do not call pnfs_return_layout() from an rpciod context
NFSv4.1: Kill nfs4_ds_disconnect()
Diffstat (limited to 'fs/ext4/super.c')
0 files changed, 0 insertions, 0 deletions