diff --git a/[refs] b/[refs] index 7b3db8f11a5e..cfc9569d7043 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab0cfb928a3839e21942a28a86ad88e56ea3b136 +refs/heads/master: 49a3df804bec09b8ee8196f79b81757e95cc6de4 diff --git a/trunk/include/linux/fscache.h b/trunk/include/linux/fscache.h index 1c0fc3e62f41..ec0dad5ab90f 100644 --- a/trunk/include/linux/fscache.h +++ b/trunk/include/linux/fscache.h @@ -454,6 +454,7 @@ int fscache_read_or_alloc_page(struct fscache_cookie *cookie, * @cookie: The cookie representing the cache object * @mapping: The netfs inode mapping to which the pages will be attached * @pages: A list of potential netfs pages to be filled + * @nr_pages: Number of pages to be read and/or allocated * @end_io_func: The callback to invoke when and if each page is filled * @context: An arbitrary piece of data to pass on to end_io_func() * @gfp: The conditions under which memory allocation should be made