diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-06-09 11:01:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-06-09 11:01:49 +1000 |
| commit | fa625c1956830c826ebf13324c2b33fcabef7db0 (patch) | |
| tree | 92c7f1272617c5c6a82478ba161af97eae0260cd /fs/ceph/super.h | |
| parent | 66fd7a66e8b9e11e49f46ea77910f935c4dee5c3 (diff) | |
| parent | af8c34ce6ae32addda3788d54a7e340cad22516b (diff) | |
| download | talos-obmc-linux-fa625c1956830c826ebf13324c2b33fcabef7db0.tar.gz talos-obmc-linux-fa625c1956830c826ebf13324c2b33fcabef7db0.zip | |
Backmerge tag 'v4.7-rc2' into drm-next
Daniel has a pull request that relies on stuff in fixes that are in rc2.
Diffstat (limited to 'fs/ceph/super.h')
| -rw-r--r-- | fs/ceph/super.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 0130a8592191..0168b49fb6ad 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -103,7 +103,6 @@ struct ceph_fs_client { #ifdef CONFIG_CEPH_FSCACHE struct fscache_cookie *fscache; - struct workqueue_struct *revalidate_wq; #endif }; @@ -360,8 +359,7 @@ struct ceph_inode_info { #ifdef CONFIG_CEPH_FSCACHE struct fscache_cookie *fscache; - u32 i_fscache_gen; /* sequence, for delayed fscache validate */ - struct work_struct i_revalidate_work; + u32 i_fscache_gen; #endif struct inode vfs_inode; /* at end */ }; |
