diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-08-26 13:22:27 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-08-26 13:22:27 -0400 |
| commit | f632265d0ffb5acf331252d98c64939849d96bb2 (patch) | |
| tree | 31187d9a726bf1ca6ca12e26ad8e7c609eaf4d8b /fs/hpfs/hpfs_fn.h | |
| parent | 7d94784293096c0a46897acdb83be5abd9278ece (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
Merge commit 'v2.6.36-rc1' into HEAD
Diffstat (limited to 'fs/hpfs/hpfs_fn.h')
| -rw-r--r-- | fs/hpfs/hpfs_fn.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hpfs/hpfs_fn.h b/fs/hpfs/hpfs_fn.h index 75f9d4324851..b59eac0232a0 100644 --- a/fs/hpfs/hpfs_fn.h +++ b/fs/hpfs/hpfs_fn.h | |||
| @@ -281,7 +281,7 @@ void hpfs_write_inode(struct inode *); | |||
| 281 | void hpfs_write_inode_nolock(struct inode *); | 281 | void hpfs_write_inode_nolock(struct inode *); |
| 282 | int hpfs_setattr(struct dentry *, struct iattr *); | 282 | int hpfs_setattr(struct dentry *, struct iattr *); |
| 283 | void hpfs_write_if_changed(struct inode *); | 283 | void hpfs_write_if_changed(struct inode *); |
| 284 | void hpfs_delete_inode(struct inode *); | 284 | void hpfs_evict_inode(struct inode *); |
| 285 | 285 | ||
| 286 | /* map.c */ | 286 | /* map.c */ |
| 287 | 287 | ||