Take statfs variants to fs/statfs.c

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

diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index aa9132d..85d9ec6 100644 (file)
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/fs.h>
+#include <linux/quotaops.h>
 #include "jfs_incore.h"
 #include "jfs_inode.h"
 #include "jfs_dmap.h"
@@ -47,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;
 
        /*
@@ -88,15 +89,41 @@ static int jfs_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-struct inode_operations jfs_file_inode_operations = {
+int jfs_setattr(struct dentry *dentry, struct iattr *iattr)
+{
+       struct inode *inode = dentry->d_inode;
+       int rc;
+
+       rc = inode_change_ok(inode, 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);
+               if (rc)
+                       return rc;
+       }
+
+       rc = inode_setattr(inode, iattr);
+
+       if (!rc && (iattr->ia_valid & ATTR_MODE))
+               rc = jfs_acl_chmod(inode);
+
+       return rc;
+}
+
+const struct inode_operations jfs_file_inode_operations = {
        .truncate       = jfs_truncate,
        .setxattr       = jfs_setxattr,
        .getxattr       = jfs_getxattr,
        .listxattr      = jfs_listxattr,
        .removexattr    = jfs_removexattr,
-#ifdef CONFIG_JFS_POSIX_ACL
        .setattr        = jfs_setattr,
-       .permission     = jfs_permission,
+#ifdef CONFIG_JFS_POSIX_ACL
+       .check_acl      = jfs_check_acl,
 #endif
 };
 
@@ -108,10 +135,12 @@ const struct file_operations jfs_file_operations = {
        .aio_read       = generic_file_aio_read,
        .aio_write      = generic_file_aio_write,
        .mmap           = generic_file_mmap,
-       .sendfile       = generic_file_sendfile,
        .splice_read    = generic_file_splice_read,
        .splice_write   = generic_file_splice_write,
        .fsync          = jfs_fsync,
        .release        = jfs_release,
-       .ioctl          = jfs_ioctl,
+       .unlocked_ioctl = jfs_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = jfs_compat_ioctl,
+#endif
 };