diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 10:08:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 10:08:21 -0700 |
| commit | 57c155d51e2f3d7411eeac5e7fd7634d2d1f6b4f (patch) | |
| tree | e381b00f8b822980545adec6f3c9e03cea07c9b7 /fs/exofs/dir.c | |
| parent | 9afd281a152702143961c09b5482a66eeefe5e03 (diff) | |
| parent | fe2fd9ed5bf184f797412be8b86f4589d1b77bb8 (diff) | |
| download | op-kernel-dev-57c155d51e2f3d7411eeac5e7fd7634d2d1f6b4f.zip op-kernel-dev-57c155d51e2f3d7411eeac5e7fd7634d2d1f6b4f.tar.gz | |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
exofs: Remove inode->i_count manipulation in exofs_new_inode
fs/exofs: typo fix of faild to failed
exofs: Set i_mapping->backing_dev_info anyway
exofs: Cleaup read path in regard with read_for_write
Diffstat (limited to 'fs/exofs/dir.c')
| -rw-r--r-- | fs/exofs/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/exofs/dir.c b/fs/exofs/dir.c index d91e9d8..dcc941d 100644 --- a/fs/exofs/dir.c +++ b/fs/exofs/dir.c @@ -420,7 +420,7 @@ int exofs_set_link(struct inode *dir, struct exofs_dir_entry *de, err = exofs_write_begin(NULL, page->mapping, pos, len, AOP_FLAG_UNINTERRUPTIBLE, &page, NULL); if (err) - EXOFS_ERR("exofs_set_link: exofs_write_begin FAILD => %d\n", + EXOFS_ERR("exofs_set_link: exofs_write_begin FAILED => %d\n", err); de->inode_no = cpu_to_le64(inode->i_ino); @@ -556,7 +556,7 @@ int exofs_delete_entry(struct exofs_dir_entry *dir, struct page *page) err = exofs_write_begin(NULL, page->mapping, pos, to - from, 0, &page, NULL); if (err) - EXOFS_ERR("exofs_delete_entry: exofs_write_begin FAILD => %d\n", + EXOFS_ERR("exofs_delete_entry: exofs_write_begin FAILED => %d\n", err); if (pde) pde->rec_len = cpu_to_le16(to - from); |
