diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
| commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
| tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /fs/jffs2/symlink.c | |
| parent | b73d884756303316ead4cd7dad51236b2a515a1a (diff) | |
| parent | 86d710146fb9975f04c505ec78caa43d227c1018 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
Diffstat (limited to 'fs/jffs2/symlink.c')
| -rw-r--r-- | fs/jffs2/symlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/symlink.c b/fs/jffs2/symlink.c index b7339c3b6ad9..4ec11e8bda8c 100644 --- a/fs/jffs2/symlink.c +++ b/fs/jffs2/symlink.c | |||
| @@ -21,7 +21,7 @@ const struct inode_operations jffs2_symlink_inode_operations = | |||
| 21 | { | 21 | { |
| 22 | .readlink = generic_readlink, | 22 | .readlink = generic_readlink, |
| 23 | .follow_link = jffs2_follow_link, | 23 | .follow_link = jffs2_follow_link, |
| 24 | .permission = jffs2_permission, | 24 | .check_acl = jffs2_check_acl, |
| 25 | .setattr = jffs2_setattr, | 25 | .setattr = jffs2_setattr, |
| 26 | .setxattr = jffs2_setxattr, | 26 | .setxattr = jffs2_setxattr, |
| 27 | .getxattr = jffs2_getxattr, | 27 | .getxattr = jffs2_getxattr, |