projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into perfcounters/core
[firefly-linux-kernel-4.4.55.git]
/
fs
/
nilfs2
/
nilfs.h
diff --git
a/fs/nilfs2/nilfs.h
b/fs/nilfs2/nilfs.h
index edf6a59d9f2a1710e404e45250308dfa06ba28f9..724c63766e827c9232bd197a99b93af8064aea20 100644
(file)
--- a/
fs/nilfs2/nilfs.h
+++ b/
fs/nilfs2/nilfs.h
@@
-57,10
+57,6
@@
struct nilfs_inode_info {
* EAs.
*/
struct rw_semaphore xattr_sem;
-#endif
-#ifdef CONFIG_NILFS_POSIX_ACL
- struct posix_acl *i_acl;
- struct posix_acl *i_default_acl;
#endif
struct buffer_head *i_bh; /* i_bh contains a new or dirty
disk inode */