diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-06-30 23:30:06 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-06-30 23:30:06 -0400 |
| commit | c074cefcc0f75152bc74a1c4f2e7b662f09403d4 (patch) | |
| tree | 5b323c1c83ecfb7a2de95b26969adc7cb5d8d507 /include/linux | |
| parent | ea7d4c046ba6e2c6135c98721f4f09efd1adaabc (diff) | |
| parent | e06b933e6ded42384164d28a2060b7f89243b895 (diff) | |
| download | cachepc-linux-c074cefcc0f75152bc74a1c4f2e7b662f09403d4.tar.gz cachepc-linux-c074cefcc0f75152bc74a1c4f2e7b662f09403d4.zip | |
Merge branch 'for-linus' into work.misc
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/binfmts.h | 1 | ||||
| -rw-r--r-- | include/linux/dcache.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index 576e4639ca60..314b3caa701c 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -65,6 +65,7 @@ struct coredump_params { unsigned long limit; unsigned long mm_flags; loff_t written; + loff_t pos; }; /* diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 484c8792da82..bcd0c64e3ed8 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -212,6 +212,7 @@ struct dentry_operations { #define DCACHE_OP_REAL 0x08000000 #define DCACHE_PAR_LOOKUP 0x10000000 /* being looked up (with parent locked shared) */ +#define DCACHE_DENTRY_CURSOR 0x20000000 extern seqlock_t rename_lock; |