Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / fuse / file.c

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index b2dae9d1437cf36a9c61178166f9ff9f1de24ec1..6e16dad13e9b16de0358f8caaec9833d9f00a84b 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1088,8 +1088,6 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,
                tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes);
                flush_dcache_page(page);
 
-               mark_page_accessed(page);
-
                if (!tmp) {
                        unlock_page(page);
                        page_cache_release(page);
@@ -2271,7 +2269,6 @@ static int fuse_file_flock(struct file *file, int cmd, struct file_lock *fl)
                struct fuse_file *ff = file->private_data;
 
                /* emulate flock with POSIX locks */
-               fl->fl_owner = (fl_owner_t) file;
                ff->flock = true;
                err = fuse_setlk(file, fl, 1);
        }