diff options
author | Dave Airlie <airlied@redhat.com> | 2010-08-02 10:05:18 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-08-02 10:05:24 +1000 |
commit | d656ae53f64cb0f01dac8a02c4d31453d64ef97c (patch) | |
tree | cf641d4e5828b8f7c430b42657237c5daf9571fd /fs/nfs/internal.h | |
parent | 167ffc44caaee68ea60dadf6931a4d195a4ed1f0 (diff) | |
parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) |
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
Diffstat (limited to 'fs/nfs/internal.h')
-rw-r--r-- | fs/nfs/internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index d8bd619e386c..e70f44b9b3f4 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -205,7 +205,8 @@ extern struct rpc_procinfo nfs4_procedures[]; void nfs_close_context(struct nfs_open_context *ctx, int is_sync); /* dir.c */ -extern int nfs_access_cache_shrinker(int nr_to_scan, gfp_t gfp_mask); +extern int nfs_access_cache_shrinker(struct shrinker *shrink, + int nr_to_scan, gfp_t gfp_mask); /* inode.c */ extern struct workqueue_struct *nfsiod_workqueue; |