diff --git a/[refs] b/[refs] index df8e5c1bc925..81931e0cd22f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d80f2ecd506d9732ad94a6da104580bb47680d6 +refs/heads/master: b6a2e569e2157509951c9f3f58dfa18b44ce91b3 diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c index 509dcb58959e..f919d9a01a27 100644 --- a/trunk/fs/nfs/file.c +++ b/trunk/fs/nfs/file.c @@ -393,9 +393,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);