diff options
Diffstat (limited to 'fs/nfsd/nfs4recover.c')
| -rw-r--r-- | fs/nfsd/nfs4recover.c | 20 | 
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index 954cf893d50..be963a133aa 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c @@ -121,9 +121,9 @@ out:  static void  nfsd4_sync_rec_dir(void)  { -	down(&rec_dir.dentry->d_inode->i_sem); +	mutex_lock(&rec_dir.dentry->d_inode->i_mutex);  	nfsd_sync_dir(rec_dir.dentry); -	up(&rec_dir.dentry->d_inode->i_sem); +	mutex_unlock(&rec_dir.dentry->d_inode->i_mutex);  }  int @@ -143,7 +143,7 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)  	nfs4_save_user(&uid, &gid);  	/* lock the parent */ -	down(&rec_dir.dentry->d_inode->i_sem); +	mutex_lock(&rec_dir.dentry->d_inode->i_mutex);  	dentry = lookup_one_len(dname, rec_dir.dentry, HEXDIR_LEN-1);  	if (IS_ERR(dentry)) { @@ -159,7 +159,7 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)  out_put:  	dput(dentry);  out_unlock: -	up(&rec_dir.dentry->d_inode->i_sem); +	mutex_unlock(&rec_dir.dentry->d_inode->i_mutex);  	if (status == 0) {  		clp->cl_firststate = 1;  		nfsd4_sync_rec_dir(); @@ -259,9 +259,9 @@ nfsd4_remove_clid_file(struct dentry *dir, struct dentry *dentry)  		printk("nfsd4: non-file found in client recovery directory\n");  		return -EINVAL;  	} -	down(&dir->d_inode->i_sem); +	mutex_lock(&dir->d_inode->i_mutex);  	status = vfs_unlink(dir->d_inode, dentry); -	up(&dir->d_inode->i_sem); +	mutex_unlock(&dir->d_inode->i_mutex);  	return status;  } @@ -274,9 +274,9 @@ nfsd4_clear_clid_dir(struct dentry *dir, struct dentry *dentry)  	 * any regular files anyway, just in case the directory was created by  	 * a kernel from the future.... */  	nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file); -	down(&dir->d_inode->i_sem); +	mutex_lock(&dir->d_inode->i_mutex);  	status = vfs_rmdir(dir->d_inode, dentry); -	up(&dir->d_inode->i_sem); +	mutex_unlock(&dir->d_inode->i_mutex);  	return status;  } @@ -288,9 +288,9 @@ nfsd4_unlink_clid_dir(char *name, int namlen)  	dprintk("NFSD: nfsd4_unlink_clid_dir. name %.*s\n", namlen, name); -	down(&rec_dir.dentry->d_inode->i_sem); +	mutex_lock(&rec_dir.dentry->d_inode->i_mutex);  	dentry = lookup_one_len(name, rec_dir.dentry, namlen); -	up(&rec_dir.dentry->d_inode->i_sem); +	mutex_unlock(&rec_dir.dentry->d_inode->i_mutex);  	if (IS_ERR(dentry)) {  		status = PTR_ERR(dentry);  		return status;  |