diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-12-13 09:41:59 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-12-13 09:41:59 +0200 |
| commit | 9b18d42dda985c99db4adde45bbdf7cd79a7525c (patch) | |
| tree | 78481b44090a9ee19780091ade05a320cbc6a7bb /fs/ceph/cache.c | |
| parent | 39bdb17ebb5bd7a5c8a231d7cac4a4d5ccc58149 (diff) | |
| parent | 1b894521e60c1b91db1e8ba1278660e5c89f1b5f (diff) | |
Merge tag 'mac80211-next-for-davem-2015-12-07' into next
This pull request got a bit bigger than I wanted, due to
needing to reshuffle and fix some bugs. I merged mac80211
to get the right base for some of these changes.
* new mac80211 API for upcoming driver changes: EOSP handling,
key iteration
* scan abort changes allowing to cancel an ongoing scan
* VHT IBSS 80+80 MHz support
* re-enable full AP client state tracking after fixes
* various small fixes (that weren't relevant for mac80211)
* various cleanups
Diffstat (limited to 'fs/ceph/cache.c')
| -rw-r--r-- | fs/ceph/cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/cache.c b/fs/ceph/cache.c index 834f9f3723fbe..a4766ded1ba78 100644 --- a/fs/ceph/cache.c +++ b/fs/ceph/cache.c @@ -88,7 +88,7 @@ static uint16_t ceph_fscache_inode_get_key(const void *cookie_netfs_data, const struct ceph_inode_info* ci = cookie_netfs_data; uint16_t klen; - /* use ceph virtual inode (id + snaphot) */ + /* use ceph virtual inode (id + snapshot) */ klen = sizeof(ci->i_vino); if (klen > maxbuf) return 0; |