projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block
[linux-2.6-block.git]
/
fs
/
hfsplus
/
inode.c
diff --git
a/fs/hfsplus/inode.c
b/fs/hfsplus/inode.c
index 45dab5d6cc10a25f7e37a80d847566f6c4001a66..6f7c662174dbb5f3ffc3e832088b5efe79f67312 100644
(file)
--- a/
fs/hfsplus/inode.c
+++ b/
fs/hfsplus/inode.c
@@
-131,6
+131,11
@@
const struct address_space_operations hfsplus_aops = {
.writepages = hfsplus_writepages,
};
.writepages = hfsplus_writepages,
};
+struct dentry_operations hfsplus_dentry_operations = {
+ .d_hash = hfsplus_hash_dentry,
+ .d_compare = hfsplus_compare_dentry,
+};
+
static struct dentry *hfsplus_file_lookup(struct inode *dir, struct dentry *dentry,
struct nameidata *nd)
{
static struct dentry *hfsplus_file_lookup(struct inode *dir, struct dentry *dentry,
struct nameidata *nd)
{
@@
-288,7
+293,7
@@
static const struct file_operations hfsplus_file_operations = {
.write = do_sync_write,
.aio_write = generic_file_aio_write,
.mmap = generic_file_mmap,
.write = do_sync_write,
.aio_write = generic_file_aio_write,
.mmap = generic_file_mmap,
- .s
endfile = generic_file_sendfile
,
+ .s
plice_read = generic_file_splice_read
,
.fsync = file_fsync,
.open = hfsplus_file_open,
.release = hfsplus_file_release,
.fsync = file_fsync,
.open = hfsplus_file_open,
.release = hfsplus_file_release,