diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-11 16:23:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-11 16:23:48 -0400 |
| commit | fd048088306656824958e7783ffcee27e241b361 (patch) | |
| tree | be11bebe3bbd2cac88ff27bd3c7450339d21bdc7 /fs/ext4/symlink.c | |
| parent | 5c3c4d9b5810c9aabd8c05219c62ca088aa83eb0 (diff) | |
| parent | 03010a3350301baac2154fa66de925ae2981b7e3 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (43 commits)
ext4: Rename ext4dev to ext4
ext4: Avoid double dirtying of super block in ext4_put_super()
Update ext4 MAINTAINERS file
Hook ext4 to the vfs fiemap interface.
generic block based fiemap implementation
ocfs2: fiemap support
vfs: vfs-level fiemap interface
ext4: fix xattr deadlock
jbd2: Fix buffer head leak when writing the commit block
ext4: Add debugging markers that can be used by systemtap
jbd2: abort instead of waiting for nonexistent transaction
ext4: fix initialization of UNINIT bitmap blocks
ext4: Remove old legacy block allocator
ext4: Use readahead when reading an inode from the inode table
ext4: Improve the documentation for ext4's /proc tunables
ext4: Combine proc file handling into a single set of functions
ext4: move /proc setup and teardown out of mballoc.c
ext4: Don't use 'struct dentry' for internal lookups
ext4/jbd2: Avoid WARN() messages when failing to write to the superblock
ext4: use percpu data structures for lg_prealloc_list
...
Diffstat (limited to 'fs/ext4/symlink.c')
| -rw-r--r-- | fs/ext4/symlink.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c index e9178643dc01..00740cb32be3 100644 --- a/fs/ext4/symlink.c +++ b/fs/ext4/symlink.c | |||
| @@ -23,10 +23,10 @@ | |||
| 23 | #include "ext4.h" | 23 | #include "ext4.h" |
| 24 | #include "xattr.h" | 24 | #include "xattr.h" |
| 25 | 25 | ||
| 26 | static void * ext4_follow_link(struct dentry *dentry, struct nameidata *nd) | 26 | static void *ext4_follow_link(struct dentry *dentry, struct nameidata *nd) |
| 27 | { | 27 | { |
| 28 | struct ext4_inode_info *ei = EXT4_I(dentry->d_inode); | 28 | struct ext4_inode_info *ei = EXT4_I(dentry->d_inode); |
| 29 | nd_set_link(nd, (char*)ei->i_data); | 29 | nd_set_link(nd, (char *) ei->i_data); |
| 30 | return NULL; | 30 | return NULL; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| @@ -34,7 +34,7 @@ const struct inode_operations ext4_symlink_inode_operations = { | |||
| 34 | .readlink = generic_readlink, | 34 | .readlink = generic_readlink, |
| 35 | .follow_link = page_follow_link_light, | 35 | .follow_link = page_follow_link_light, |
| 36 | .put_link = page_put_link, | 36 | .put_link = page_put_link, |
| 37 | #ifdef CONFIG_EXT4DEV_FS_XATTR | 37 | #ifdef CONFIG_EXT4_FS_XATTR |
| 38 | .setxattr = generic_setxattr, | 38 | .setxattr = generic_setxattr, |
| 39 | .getxattr = generic_getxattr, | 39 | .getxattr = generic_getxattr, |
| 40 | .listxattr = ext4_listxattr, | 40 | .listxattr = ext4_listxattr, |
| @@ -45,7 +45,7 @@ const struct inode_operations ext4_symlink_inode_operations = { | |||
| 45 | const struct inode_operations ext4_fast_symlink_inode_operations = { | 45 | const struct inode_operations ext4_fast_symlink_inode_operations = { |
| 46 | .readlink = generic_readlink, | 46 | .readlink = generic_readlink, |
| 47 | .follow_link = ext4_follow_link, | 47 | .follow_link = ext4_follow_link, |
| 48 | #ifdef CONFIG_EXT4DEV_FS_XATTR | 48 | #ifdef CONFIG_EXT4_FS_XATTR |
| 49 | .setxattr = generic_setxattr, | 49 | .setxattr = generic_setxattr, |
| 50 | .getxattr = generic_getxattr, | 50 | .getxattr = generic_getxattr, |
| 51 | .listxattr = ext4_listxattr, | 51 | .listxattr = ext4_listxattr, |