projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'tty-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[cascardo/linux.git]
/
fs
/
jfs
/
namei.c
diff --git
a/fs/jfs/namei.c
b/fs/jfs/namei.c
index
aa8a337
..
d59c7de
100644
(file)
--- a/
fs/jfs/namei.c
+++ b/
fs/jfs/namei.c
@@
-1524,6
+1524,7
@@
const struct inode_operations jfs_dir_inode_operations = {
.setattr = jfs_setattr,
#ifdef CONFIG_JFS_POSIX_ACL
.get_acl = jfs_get_acl,
+ .set_acl = jfs_set_acl,
#endif
};