Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[linux-2.6-block.git] / fs / hfs / attr.c

diff --git a/fs/hfs/attr.c b/fs/hfs/attr.c
index 064f92f17efc8c1a1f7110e1986bced67911700f..d9a86919fdf6e9d371b7d01d048acf100f0cc0a6 100644 (file)
--- a/fs/hfs/attr.c
+++ b/fs/hfs/attr.c
@@ -13,10 +13,10 @@
 #include "hfs_fs.h"
 #include "btree.h"
 
-int hfs_setxattr(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags)
+int hfs_setxattr(struct dentry *unused, struct inode *inode,
+                const char *name, const void *value,
+                size_t size, int flags)
 {
-       struct inode *inode = d_inode(dentry);
        struct hfs_find_data fd;
        hfs_cat_rec rec;
        struct hfs_cat_file *file;