diff options
-rw-r--r-- | fs/nfs/inode.c | 4 | ||||
-rw-r--r-- | fs/nfs/super.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 3adabd154779..df23f987da6b 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -370,7 +370,6 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr) | |||
370 | if ((attr->ia_valid & ~ATTR_FILE) == 0) | 370 | if ((attr->ia_valid & ~ATTR_FILE) == 0) |
371 | return 0; | 371 | return 0; |
372 | 372 | ||
373 | lock_kernel(); | ||
374 | /* Write all dirty data */ | 373 | /* Write all dirty data */ |
375 | if (S_ISREG(inode->i_mode)) { | 374 | if (S_ISREG(inode->i_mode)) { |
376 | filemap_write_and_wait(inode->i_mapping); | 375 | filemap_write_and_wait(inode->i_mapping); |
@@ -384,7 +383,6 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr) | |||
384 | error = NFS_PROTO(inode)->setattr(dentry, &fattr, attr); | 383 | error = NFS_PROTO(inode)->setattr(dentry, &fattr, attr); |
385 | if (error == 0) | 384 | if (error == 0) |
386 | nfs_refresh_inode(inode, &fattr); | 385 | nfs_refresh_inode(inode, &fattr); |
387 | unlock_kernel(); | ||
388 | return error; | 386 | return error; |
389 | } | 387 | } |
390 | 388 | ||
@@ -700,7 +698,6 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) | |||
700 | inode->i_sb->s_id, (long long)NFS_FILEID(inode)); | 698 | inode->i_sb->s_id, (long long)NFS_FILEID(inode)); |
701 | 699 | ||
702 | nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE); | 700 | nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE); |
703 | lock_kernel(); | ||
704 | if (is_bad_inode(inode)) | 701 | if (is_bad_inode(inode)) |
705 | goto out_nowait; | 702 | goto out_nowait; |
706 | if (NFS_STALE(inode)) | 703 | if (NFS_STALE(inode)) |
@@ -749,7 +746,6 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) | |||
749 | nfs_wake_up_inode(inode); | 746 | nfs_wake_up_inode(inode); |
750 | 747 | ||
751 | out_nowait: | 748 | out_nowait: |
752 | unlock_kernel(); | ||
753 | return status; | 749 | return status; |
754 | } | 750 | } |
755 | 751 | ||
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 47cf83e917be..1b94e3650f5c 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
@@ -374,8 +374,6 @@ static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
374 | }; | 374 | }; |
375 | int error; | 375 | int error; |
376 | 376 | ||
377 | lock_kernel(); | ||
378 | |||
379 | error = server->nfs_client->rpc_ops->statfs(server, fh, &res); | 377 | error = server->nfs_client->rpc_ops->statfs(server, fh, &res); |
380 | if (error < 0) | 378 | if (error < 0) |
381 | goto out_err; | 379 | goto out_err; |
@@ -407,12 +405,10 @@ static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
407 | 405 | ||
408 | buf->f_namelen = server->namelen; | 406 | buf->f_namelen = server->namelen; |
409 | 407 | ||
410 | unlock_kernel(); | ||
411 | return 0; | 408 | return 0; |
412 | 409 | ||
413 | out_err: | 410 | out_err: |
414 | dprintk("%s: statfs error = %d\n", __func__, -error); | 411 | dprintk("%s: statfs error = %d\n", __func__, -error); |
415 | unlock_kernel(); | ||
416 | return error; | 412 | return error; |
417 | } | 413 | } |
418 | 414 | ||