Commit 5724ab37 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: nfs_instantiate() should set the dentry verifier 



That will also allow us to remove the calls in mknod and mkdir.
In addition it will ensure that symlinks set it correctly.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent fab728e1

fs/nfs/dir.c

+1 −3
Original line number Diff line number Diff line
@@ -1189,6 +1189,7 @@ int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle, 
		if (error)

			goto out_error;

	}

	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));

	if (!(fattr->valid & NFS_ATTR_FATTR)) {

		struct nfs_server *server = NFS_SB(dentry->d_sb);

		error = server->nfs_client->rpc_ops->getattr(server, fhandle, fattr);
@@ -1237,7 +1238,6 @@ static int nfs_create(struct inode *dir, struct dentry *dentry, int mode, 
	nfs_end_data_update(dir);

	if (error != 0)

		goto out_err;

	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));

	unlock_kernel();

	return 0;

out_err:
@@ -1270,7 +1270,6 @@ nfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev) 
	nfs_end_data_update(dir);

	if (status != 0)

		goto out_err;

	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));

	unlock_kernel();

	return 0;

out_err:
@@ -1299,7 +1298,6 @@ static int nfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) 
	nfs_end_data_update(dir);

	if (error != 0)

		goto out_err;

	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));

	unlock_kernel();

	return 0;

out_err: