diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-13 10:58:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-13 10:58:45 -0700 |
| commit | 4264e6a263fc7166a5aa5234819b94f6fc9a2cd2 (patch) | |
| tree | 15418e913161c719b738b6defa53cac8ebeb2dfd | |
| parent | 8d657eb3b43861064d36241e88d9d61c709f33f0 (diff) | |
| parent | f1daf666dd7d097653bd38320248c68084b1febf (diff) | |
| download | linux-3.10-4264e6a263fc7166a5aa5234819b94f6fc9a2cd2.tar.gz linux-3.10-4264e6a263fc7166a5aa5234819b94f6fc9a2cd2.tar.bz2 linux-3.10-4264e6a263fc7166a5aa5234819b94f6fc9a2cd2.zip | |
Merge tag 'nfs-for-3.5-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes from Trond Myklebust:
- Fix an NFSv4 mount regression
- Fix O_DIRECT list manipulation snafus
* tag 'nfs-for-3.5-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFSv4: Fix an NFSv4 mount regression
NFS: Fix list manipulation snafus in fs/nfs/direct.c
| -rw-r--r-- | fs/nfs/direct.c | 6 | ||||
| -rw-r--r-- | fs/nfs/super.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 9a4cbfc85d8..48253372ab1 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -484,6 +484,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) list_for_each_entry_safe(req, tmp, &reqs, wb_list) { if (!nfs_pageio_add_request(&desc, req)) { + nfs_list_remove_request(req); nfs_list_add_request(req, &failed); spin_lock(cinfo.lock); dreq->flags = 0; @@ -494,8 +495,11 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) } nfs_pageio_complete(&desc); - while (!list_empty(&failed)) + while (!list_empty(&failed)) { + req = nfs_list_entry(failed.next); + nfs_list_remove_request(req); nfs_unlock_and_release_request(req); + } if (put_dreq(dreq)) nfs_direct_write_complete(dreq, dreq->inode); diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 906f09c7d84..06228192f64 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2860,6 +2860,8 @@ static struct dentry *nfs4_try_mount(int flags, const char *dev_name, dfprintk(MOUNT, "--> nfs4_try_mount()\n"); + mount_info->fill_super = nfs4_fill_super; + export_path = data->nfs_server.export_path; data->nfs_server.export_path = "/"; root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, mount_info, |