Browse Source

NFS: Remove attribute update related BKL references

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Trond Myklebust 17 years ago
parent
commit
fa6dc9dc59
2 changed files with 0 additions and 8 deletions
  1. 0 4
      fs/nfs/inode.c
  2. 0 4
      fs/nfs/super.c

+ 0 - 4
fs/nfs/inode.c

@@ -370,7 +370,6 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
 	if ((attr->ia_valid & ~ATTR_FILE) == 0)
 	if ((attr->ia_valid & ~ATTR_FILE) == 0)
 		return 0;
 		return 0;
 
 
-	lock_kernel();
 	/* Write all dirty data */
 	/* Write all dirty data */
 	if (S_ISREG(inode->i_mode)) {
 	if (S_ISREG(inode->i_mode)) {
 		filemap_write_and_wait(inode->i_mapping);
 		filemap_write_and_wait(inode->i_mapping);
@@ -384,7 +383,6 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
 	error = NFS_PROTO(inode)->setattr(dentry, &fattr, attr);
 	error = NFS_PROTO(inode)->setattr(dentry, &fattr, attr);
 	if (error == 0)
 	if (error == 0)
 		nfs_refresh_inode(inode, &fattr);
 		nfs_refresh_inode(inode, &fattr);
-	unlock_kernel();
 	return error;
 	return error;
 }
 }
 
 
@@ -700,7 +698,6 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
 		inode->i_sb->s_id, (long long)NFS_FILEID(inode));
 		inode->i_sb->s_id, (long long)NFS_FILEID(inode));
 
 
 	nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE);
 	nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE);
-	lock_kernel();
 	if (is_bad_inode(inode))
 	if (is_bad_inode(inode))
  		goto out_nowait;
  		goto out_nowait;
 	if (NFS_STALE(inode))
 	if (NFS_STALE(inode))
@@ -749,7 +746,6 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
 	nfs_wake_up_inode(inode);
 	nfs_wake_up_inode(inode);
 
 
  out_nowait:
  out_nowait:
-	unlock_kernel();
 	return status;
 	return status;
 }
 }
 
 

+ 0 - 4
fs/nfs/super.c

@@ -374,8 +374,6 @@ static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 	};
 	};
 	int error;
 	int error;
 
 
-	lock_kernel();
-
 	error = server->nfs_client->rpc_ops->statfs(server, fh, &res);
 	error = server->nfs_client->rpc_ops->statfs(server, fh, &res);
 	if (error < 0)
 	if (error < 0)
 		goto out_err;
 		goto out_err;
@@ -407,12 +405,10 @@ static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 
 
 	buf->f_namelen = server->namelen;
 	buf->f_namelen = server->namelen;
 
 
-	unlock_kernel();
 	return 0;
 	return 0;
 
 
  out_err:
  out_err:
 	dprintk("%s: statfs error = %d\n", __func__, -error);
 	dprintk("%s: statfs error = %d\n", __func__, -error);
-	unlock_kernel();
 	return error;
 	return error;
 }
 }