diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 10:50:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 10:50:40 -0500 |
commit | b65f0d673a0280a49b80f44c9a62e5dfc1ec203f (patch) | |
tree | 10ddeb6fc4c9b1822a5e83ef8dd6771d8d34966f /fs/nilfs2/file.c | |
parent | f3ea597251ac859a1c0e7b9e266877f1ac828009 (diff) | |
parent | 365e215ce1f154e288ff0f7c9acbdf5421f57949 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: unfold nilfs_dat_inode function
nilfs2: do not pass sbi to functions which can get it from inode
nilfs2: get rid of nilfs_mount_options structure
nilfs2: simplify nilfs_mdt_freeze_buffer
nilfs2: get rid of loaded flag from nilfs object
nilfs2: fix a checkpatch error in page.c
nilfs2: fiemap support
nilfs2: mark buffer heads as delayed until the data is written to disk
nilfs2: call nilfs_error inside bmap routines
fs/nilfs2/super.c: Use printf extension %pV
MAINTAINERS: add nilfs2 git tree entry
Diffstat (limited to 'fs/nilfs2/file.c')
-rw-r--r-- | fs/nilfs2/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c index c9a30d7ff6f..2f560c9fb80 100644 --- a/fs/nilfs2/file.c +++ b/fs/nilfs2/file.c | |||
@@ -155,6 +155,7 @@ const struct inode_operations nilfs_file_inode_operations = { | |||
155 | .truncate = nilfs_truncate, | 155 | .truncate = nilfs_truncate, |
156 | .setattr = nilfs_setattr, | 156 | .setattr = nilfs_setattr, |
157 | .permission = nilfs_permission, | 157 | .permission = nilfs_permission, |
158 | .fiemap = nilfs_fiemap, | ||
158 | }; | 159 | }; |
159 | 160 | ||
160 | /* end of file */ | 161 | /* end of file */ |