aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Prabhu <sprabhu@redhat.com>2013-09-13 09:11:56 -0400
committerSteve French <smfrench@gmail.com>2013-09-13 17:24:43 -0400
commita9e9b7bc15a32ec5b0679704e70f3ffeecfaadd8 (patch)
tree2ab7abf527707b078012164a40af12ee02641aff
parentbdbdfdef5766c2a60185e946df242f1bc0d37c09 (diff)
cifs: Do not take a reference to the page in cifs_readpage_worker()
We do not need to take a reference to the pagecache in cifs_readpage_worker() since the calling function will have already taken one before passing the pointer to the page as an argument to the function. Signed-off-by: Sachin Prabhu <sprabhu@redhat.com> Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>
-rw-r--r--fs/cifs/file.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index d044b35ce228..5f99ee551662 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -3379,6 +3379,9 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
3379 return rc; 3379 return rc;
3380} 3380}
3381 3381
3382/*
3383 * cifs_readpage_worker must be called with the page pinned
3384 */
3382static int cifs_readpage_worker(struct file *file, struct page *page, 3385static int cifs_readpage_worker(struct file *file, struct page *page,
3383 loff_t *poffset) 3386 loff_t *poffset)
3384{ 3387{
@@ -3390,7 +3393,6 @@ static int cifs_readpage_worker(struct file *file, struct page *page,
3390 if (rc == 0) 3393 if (rc == 0)
3391 goto read_complete; 3394 goto read_complete;
3392 3395
3393 page_cache_get(page);
3394 read_data = kmap(page); 3396 read_data = kmap(page);
3395 /* for reads over a certain size could initiate async read ahead */ 3397 /* for reads over a certain size could initiate async read ahead */
3396 3398
@@ -3417,7 +3419,6 @@ static int cifs_readpage_worker(struct file *file, struct page *page,
3417 3419
3418io_error: 3420io_error:
3419 kunmap(page); 3421 kunmap(page);
3420 page_cache_release(page);
3421 3422
3422read_complete: 3423read_complete:
3423 return rc; 3424 return rc;