drop unused dentry argument to ->fsync

[safe/jmp/linux-2.6] / fs / jfs / file.c

diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index 2c20178..127263c 100644 (file)
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -27,9 +27,9 @@
 #include "jfs_acl.h"
 #include "jfs_debug.h"
 
-int jfs_fsync(struct file *file, struct dentry *dentry, int datasync)
+int jfs_fsync(struct file *file, int datasync)
 {
-       struct inode *inode = dentry->d_inode;
+       struct inode *inode = file->f_mapping->host;
        int rc = 0;
 
        if (!(inode->i_state & I_DIRTY) ||
@@ -48,7 +48,7 @@ static int jfs_open(struct inode *inode, struct file *file)
 {
        int rc;
 
-       if ((rc = generic_file_open(inode, file)))
+       if ((rc = dquot_file_open(inode, file)))
                return rc;
 
        /*
@@ -98,6 +98,8 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr)
        if (rc)
                return rc;
 
+       if (is_quota_modification(inode, iattr))
+               dquot_initialize(inode);
        if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
            (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
                rc = dquot_transfer(inode, iattr);