diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-09 22:46:52 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2019-09-09 22:46:52 -0700 |
| commit | f7783089abe5f745d30c3c8455ef759737e0a7a0 (patch) | |
| tree | d2a11fd8d7eb8ebe38e507961b8197386ad466da /include/uapi/linux | |
| parent | a7e8a977f049e7dbf96dc58523c31c5731e1dfc5 (diff) | |
| parent | 9c59fb632e3585fe24af1eb2420bafc5884c010d (diff) | |
Merge 9c59fb632e3585fe24af1eb2420bafc5884c010d on remote branch
Change-Id: I976bf04f83cc72048f5584ca0980c1bed83c54de
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/coda_psdev.h | 13 | ||||
| -rw-r--r-- | include/uapi/linux/fs.h | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/include/uapi/linux/coda_psdev.h b/include/uapi/linux/coda_psdev.h index 79d05981fc4b..e2c44d2f7d5b 100644 --- a/include/uapi/linux/coda_psdev.h +++ b/include/uapi/linux/coda_psdev.h @@ -6,19 +6,6 @@ #define CODA_PSDEV_MAJOR 67 #define MAX_CODADEVS 5 /* how many do we allow */ - -/* messages between coda filesystem in kernel and Venus */ -struct upc_req { - struct list_head uc_chain; - caddr_t uc_data; - u_short uc_flags; - u_short uc_inSize; /* Size is at most 5000 bytes */ - u_short uc_outSize; - u_short uc_opcode; /* copied from data to save lookup */ - int uc_unique; - wait_queue_head_t uc_sleep; /* process' wait queue */ -}; - #define CODA_REQ_ASYNC 0x1 #define CODA_REQ_READ 0x2 #define CODA_REQ_WRITE 0x4 diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index d122ea5338d1..c66b52303114 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -239,6 +239,7 @@ struct fscrypt_key { #define FS_NOCOMP_FL 0x00000400 /* Don't compress */ #define FS_ECOMPR_FL 0x00000800 /* Compression error */ /* End compression flags --- maybe not all used */ +#define FS_ENCRYPT_FL 0x00000800 /* Encrypted file */ #define FS_BTREE_FL 0x00001000 /* btree format dir */ #define FS_INDEX_FL 0x00001000 /* hash-indexed directory */ #define FS_IMAGIC_FL 0x00002000 /* AFS directory */ @@ -249,6 +250,7 @@ struct fscrypt_key { #define FS_EXTENT_FL 0x00080000 /* Extents */ #define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */ #define FS_NOCOW_FL 0x00800000 /* Do not cow file */ +#define FS_INLINE_DATA_FL 0x10000000 /* Reserved for ext4 */ #define FS_PROJINHERIT_FL 0x20000000 /* Create with parents projid */ #define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ |