diff options
| author | Linus Torvalds | 2011-07-25 21:53:15 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-07-25 21:53:15 +0200 |
| commit | 0003230e8200699860f0b10af524dc47bf8aecad (patch) | |
| tree | 8addb0c889b32111d6973c46cd3d0a5b5c17606c /fs/jffs2/file.c | |
| parent | Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | fs: take the ACL checks to common code (diff) | |
| download | kernel-qcow2-linux-0003230e8200699860f0b10af524dc47bf8aecad.tar.gz kernel-qcow2-linux-0003230e8200699860f0b10af524dc47bf8aecad.tar.xz kernel-qcow2-linux-0003230e8200699860f0b10af524dc47bf8aecad.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
fs: take the ACL checks to common code
bury posix_acl_..._masq() variants
kill boilerplates around posix_acl_create_masq()
generic_acl: no need to clone acl just to push it to set_cached_acl()
kill boilerplate around posix_acl_chmod_masq()
reiserfs: cache negative ACLs for v1 stat format
xfs: cache negative ACLs if there is no attribute fork
9p: do no return 0 from ->check_acl without actually checking
vfs: move ACL cache lookup into generic code
CIFS: Fix oops while mounting with prefixpath
xfs: Fix wrong return value of xfs_file_aio_write
fix devtmpfs race
caam: don't pass bogus S_IFCHR to debugfs_create_...()
get rid of create_proc_entry() abuses - proc_mkdir() is there for purpose
asus-wmi: ->is_visible() can't return negative
fix jffs2 ACLs on big-endian with 16bit mode_t
9p: close ACL leaks
ocfs2_init_acl(): fix a leak
VFS : mount lock scalability for internal mounts
Diffstat (limited to 'fs/jffs2/file.c')
| -rw-r--r-- | fs/jffs2/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index 3989f7e09f7f..61e6723535b9 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c @@ -63,7 +63,7 @@ const struct file_operations jffs2_file_operations = const struct inode_operations jffs2_file_inode_operations = { - .check_acl = jffs2_check_acl, + .get_acl = jffs2_get_acl, .setattr = jffs2_setattr, .setxattr = jffs2_setxattr, .getxattr = jffs2_getxattr, |