Commit c9272c4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 

* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: Ensure we call nfs_sb_deactive() after releasing the directory inode
  nfs_remount oops when rebooting + possible fix
parents fb4284b2 744d18db

fs/nfs/super.c

+3 −3
Original line number Diff line number Diff line
@@ -1718,9 +1718,9 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data) 
	 * ones were explicitly specified. Fall back to legacy behavior and

	 * just return success.

	 */

	if ((nfsvers == 4 && options4->version == 1) ||

	    (nfsvers <= 3 && options->version >= 1 &&

	     options->version <= 6))

	if ((nfsvers == 4 && (!options4 || options4->version == 1)) ||

	    (nfsvers <= 3 && (!options || (options->version >= 1 &&

					   options->version <= 6))))

		return 0;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

fs/nfs/unlink.c

+2 −1
Original line number Diff line number Diff line
@@ -95,10 +95,11 @@ static void nfs_async_unlink_done(struct rpc_task *task, void *calldata) 
static void nfs_async_unlink_release(void *calldata)

{

	struct nfs_unlinkdata	*data = calldata;

	struct super_block *sb = data->dir->i_sb;



	nfs_dec_sillycount(data->dir);

	nfs_sb_deactive(NFS_SERVER(data->dir));

	nfs_free_unlinkdata(data);

	nfs_sb_deactive(NFS_SB(sb));

}



static const struct rpc_call_ops nfs_unlink_ops = {