diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-06 11:07:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-06 11:07:08 -0700 |
commit | 9022ca6b1129da44e3d5c4fa779b8bb9ceabe2ce (patch) | |
tree | 6ff139aff1cf8a00cc057b7a706a81d91ee639ca /fs/orangefs | |
parent | 38c23685b273cfb4ccf31a199feccce3bdcb5d83 (diff) | |
parent | 0e11f6443f522f89509495b13ef1f3745640144d (diff) | |
download | linux-stable-9022ca6b1129da44e3d5c4fa779b8bb9ceabe2ce.tar.gz linux-stable-9022ca6b1129da44e3d5c4fa779b8bb9ceabe2ce.tar.bz2 linux-stable-9022ca6b1129da44e3d5c4fa779b8bb9ceabe2ce.zip |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted stuff, including Christoph's I_DIRTY patches"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: move I_DIRTY_INODE to fs.h
ubifs: fix bogus __mark_inode_dirty(I_DIRTY_SYNC | I_DIRTY_DATASYNC) call
ntfs: fix bogus __mark_inode_dirty(I_DIRTY_SYNC | I_DIRTY_DATASYNC) call
gfs2: fix bogus __mark_inode_dirty(I_DIRTY_SYNC | I_DIRTY_DATASYNC) calls
fs: fold open_check_o_direct into do_dentry_open
vfs: Replace stray non-ASCII homoglyph characters with their ASCII equivalents
vfs: make sure struct filename->iname is word-aligned
get rid of pointless includes of fs_struct.h
[poll] annotate SAA6588_CMD_POLL users
Diffstat (limited to 'fs/orangefs')
-rw-r--r-- | fs/orangefs/acl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/orangefs/acl.c b/fs/orangefs/acl.c index 480ea059a680..10587413b20e 100644 --- a/fs/orangefs/acl.c +++ b/fs/orangefs/acl.c @@ -9,7 +9,6 @@ #include "orangefs-kernel.h" #include "orangefs-bufmap.h" #include <linux/posix_acl_xattr.h> -#include <linux/fs_struct.h> struct posix_acl *orangefs_get_acl(struct inode *inode, int type) { |