Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4264e6a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8d657eb3 f1daf666

fs/nfs/direct.c

+5 −1
Original line number Diff line number Diff line
@@ -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);

fs/nfs/super.c

+2 −0
Original line number Diff line number Diff line
@@ -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,