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/dir.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/dir.c')
-rw-r--r-- | fs/nilfs2/dir.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index cb003c8ee1f..9d45773b79e 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c | |||
@@ -91,7 +91,6 @@ static void nilfs_commit_chunk(struct page *page, | |||
91 | unsigned from, unsigned to) | 91 | unsigned from, unsigned to) |
92 | { | 92 | { |
93 | struct inode *dir = mapping->host; | 93 | struct inode *dir = mapping->host; |
94 | struct nilfs_sb_info *sbi = NILFS_SB(dir->i_sb); | ||
95 | loff_t pos = page_offset(page) + from; | 94 | loff_t pos = page_offset(page) + from; |
96 | unsigned len = to - from; | 95 | unsigned len = to - from; |
97 | unsigned nr_dirty, copied; | 96 | unsigned nr_dirty, copied; |
@@ -103,7 +102,7 @@ static void nilfs_commit_chunk(struct page *page, | |||
103 | i_size_write(dir, pos + copied); | 102 | i_size_write(dir, pos + copied); |
104 | if (IS_DIRSYNC(dir)) | 103 | if (IS_DIRSYNC(dir)) |
105 | nilfs_set_transaction_flag(NILFS_TI_SYNC); | 104 | nilfs_set_transaction_flag(NILFS_TI_SYNC); |
106 | err = nilfs_set_file_dirty(sbi, dir, nr_dirty); | 105 | err = nilfs_set_file_dirty(dir, nr_dirty); |
107 | WARN_ON(err); /* do not happen */ | 106 | WARN_ON(err); /* do not happen */ |
108 | unlock_page(page); | 107 | unlock_page(page); |
109 | } | 108 | } |