diff options
| author | Mister Oyster <oysterized@gmail.com> | 2017-05-29 03:24:45 +0200 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-05-29 03:52:20 +0200 |
| commit | 4d271b52d999a51fae621cd43d9d48cfb80a7b2f (patch) | |
| tree | b9149dd9f04f4a11b5e7185c1b5148f502198f35 | |
| parent | 761df2751499b4ee588430ed1b8809e7a9dc5256 (diff) | |
fscrypt: remove duplicate d_inode definition in ext4 & f2fs In file included from ../../../../../../kernel/meizu/m2note/fs/crypto/crypto.c:29:0: ../../../../../../kernel/meizu/m2note/fs/crypto/fscrypt_private.h:103:29: error: redefinition of 'd_inode' static inline struct inode *d_inode(const struct dentry *dentry) ^ In file included from ../../../../../../kernel/meizu/m2note/include/linux/fs.h:8:0, from ../../../../../../kernel/meizu/m2note/include/linux/pagemap.h:8, from ../../../../../../kernel/meizu/m2note/fs/crypto/crypto.c:22: ../../../../../../kernel/meizu/m2note/include/linux/dcache.h:430:29: note: previous definition of 'd_inode' was here static inline struct inode *d_inode(const struct dentry *dentry) ^ In file included from ../../../../../../kernel/meizu/m2note/fs/crypto/crypto.c:29:0: ../../../../../../kernel/meizu/m2note/fs/crypto/fscrypt_private.h:108:20: error: redefinition of 'd_is_negative' static inline bool d_is_negative(const struct dentry *dentry) In file included from ../../../../../../kernel/meizu/m2note/fs/f2fs/dir.c:14:0: ../../../../../../kernel/meizu/m2note/fs/f2fs/f2fs.h:182:29: error: redefinition of 'd_inode' static inline struct inode *d_inode(const struct dentry *dentry) ^ In file included from ../../../../../../kernel/meizu/m2note/include/linux/fs.h:8:0, from ../../../../../../kernel/meizu/m2note/fs/f2fs/dir.c:11: ../../../../../../kernel/meizu/m2note/include/linux/dcache.h:430:29: note: previous definition of 'd_inode' was here static inline struct inode *d_inode(const struct dentry *dentry)
| -rw-r--r-- | fs/crypto/fscrypt_private.h | 10 | ||||
| -rw-r--r-- | fs/f2fs/f2fs.h | 5 |
2 files changed, 0 insertions, 15 deletions
diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h index a0920574f..1bc34d981 100644 --- a/fs/crypto/fscrypt_private.h +++ b/fs/crypto/fscrypt_private.h @@ -100,16 +100,6 @@ static inline void bio_set_op_attrs(struct bio *bio, unsigned op, bio->bi_rw = op | op_flags; } -static inline struct inode *d_inode(const struct dentry *dentry) -{ - return dentry->d_inode; -} - -static inline bool d_is_negative(const struct dentry *dentry) -{ - return (dentry->d_inode == NULL); -} - /* crypto.c */ extern int fscrypt_initialize(unsigned int cop_flags); extern struct workqueue_struct *fscrypt_read_workqueue; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index cd1b08faa..0521f3bbd 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -179,11 +179,6 @@ static inline bool wq_has_sleeper(wait_queue_head_t *wq) return waitqueue_active(wq); } -static inline struct inode *d_inode(const struct dentry *dentry) -{ - return dentry->d_inode; -} - static inline struct dentry *file_dentry(const struct file *file) { return file->f_path.dentry; |