diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-21 15:30:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-21 15:30:07 -0400 |
| commit | 9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0 (patch) | |
| tree | 1270f24f89f10d832e879dd1352ef0209dd3aebe /fs/jfs/jfs_inode.h | |
| parent | a486b0af797e19ff79c6943cc8986111f2569fe8 (diff) | |
| parent | c7f2e1f0ac142a657a1de00d404e1c8345b20598 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
jfs: add jfs specific ->setattr call
jfs: fix diAllocExt error in resizing filesystem
jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g
Diffstat (limited to 'fs/jfs/jfs_inode.h')
| -rw-r--r-- | fs/jfs/jfs_inode.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h index 79e2c79661df..9e6bda30a6e8 100644 --- a/fs/jfs/jfs_inode.h +++ b/fs/jfs/jfs_inode.h | |||
| @@ -48,5 +48,6 @@ extern const struct file_operations jfs_dir_operations; | |||
| 48 | extern const struct inode_operations jfs_file_inode_operations; | 48 | extern const struct inode_operations jfs_file_inode_operations; |
| 49 | extern const struct file_operations jfs_file_operations; | 49 | extern const struct file_operations jfs_file_operations; |
| 50 | extern const struct inode_operations jfs_symlink_inode_operations; | 50 | extern const struct inode_operations jfs_symlink_inode_operations; |
| 51 | extern const struct inode_operations jfs_fast_symlink_inode_operations; | ||
| 51 | extern const struct dentry_operations jfs_ci_dentry_operations; | 52 | extern const struct dentry_operations jfs_ci_dentry_operations; |
| 52 | #endif /* _H_JFS_INODE */ | 53 | #endif /* _H_JFS_INODE */ |