diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-07-15 18:34:58 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-07-15 18:34:58 -0400 |
| commit | cadc723cc19ce6b881d973d3c04e25ebb83058e6 (patch) | |
| tree | 9256b4bc0685bca22469eab87cd3ec3c2deba60d /fs/nfs/file.c | |
| parent | e89e896d31b11a51a54ddcd3f72a76bd286dd86c (diff) | |
| parent | f839c4c1991cc9b580ae38f98f54554938a7f49c (diff) | |
| download | op-kernel-dev-cadc723cc19ce6b881d973d3c04e25ebb83058e6.zip op-kernel-dev-cadc723cc19ce6b881d973d3c04e25ebb83058e6.tar.gz | |
Merge branch 'bkl-removal' into next
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 43164fe..7846065 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -128,9 +128,7 @@ nfs_file_open(struct inode *inode, struct file *filp) return res; nfs_inc_stats(inode, NFSIOS_VFSOPEN); - lock_kernel(); res = nfs_open(inode, filp); - unlock_kernel(); return res; } @@ -398,9 +396,7 @@ static int nfs_write_end(struct file *file, struct address_space *mapping, zero_user_segment(page, pglen, PAGE_CACHE_SIZE); } - lock_kernel(); status = nfs_updatepage(file, page, offset, copied); - unlock_kernel(); unlock_page(page); page_cache_release(page); |
