diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-04-13 00:59:01 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-04-13 00:59:01 -0400 |
| commit | bfca9acf1a5df0ff98fbf47e363adb48612bb7ec (patch) | |
| tree | a50287c88fdc60a73912d205d7bce41b7af53827 /include/linux/fscrypt_common.h | |
| parent | 92a3fa075d3d2716b9c662814540f1d660cbf2f5 (diff) | |
| parent | 11e63f6d920d6f2dfd3cd421e939a4aec9a58dcd (diff) | |
Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
Diffstat (limited to 'include/linux/fscrypt_common.h')
| -rw-r--r-- | include/linux/fscrypt_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fscrypt_common.h b/include/linux/fscrypt_common.h index 547f81592ba1..10c1abfbac6c 100644 --- a/include/linux/fscrypt_common.h +++ b/include/linux/fscrypt_common.h | |||
| @@ -87,7 +87,6 @@ struct fscrypt_operations { | |||
| 87 | unsigned int flags; | 87 | unsigned int flags; |
| 88 | const char *key_prefix; | 88 | const char *key_prefix; |
| 89 | int (*get_context)(struct inode *, void *, size_t); | 89 | int (*get_context)(struct inode *, void *, size_t); |
| 90 | int (*prepare_context)(struct inode *); | ||
| 91 | int (*set_context)(struct inode *, const void *, size_t, void *); | 90 | int (*set_context)(struct inode *, const void *, size_t, void *); |
| 92 | int (*dummy_context)(struct inode *); | 91 | int (*dummy_context)(struct inode *); |
| 93 | bool (*is_encrypted)(struct inode *); | 92 | bool (*is_encrypted)(struct inode *); |