diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /fs/cachefiles/namei.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'fs/cachefiles/namei.c')
| -rw-r--r-- | fs/cachefiles/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c index 25badd1aec5c..f4a08d7fa2f7 100644 --- a/fs/cachefiles/namei.c +++ b/fs/cachefiles/namei.c | |||
| @@ -56,7 +56,7 @@ void __cachefiles_printk_object(struct cachefiles_object *object, | |||
| 56 | object->fscache.cookie->parent, | 56 | object->fscache.cookie->parent, |
| 57 | object->fscache.cookie->netfs_data, | 57 | object->fscache.cookie->netfs_data, |
| 58 | object->fscache.cookie->flags); | 58 | object->fscache.cookie->flags); |
| 59 | if (keybuf) | 59 | if (keybuf && cookie->def) |
| 60 | keylen = cookie->def->get_key(cookie->netfs_data, keybuf, | 60 | keylen = cookie->def->get_key(cookie->netfs_data, keybuf, |
| 61 | CACHEFILES_KEYBUF_SIZE); | 61 | CACHEFILES_KEYBUF_SIZE); |
| 62 | else | 62 | else |