Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / fs / orangefs / inode.c

diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index d4c6915..ef3b4eb 100644 (file)
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -219,7 +219,7 @@ int orangefs_setattr(struct dentry *dentry, struct iattr *iattr)
                     "orangefs_setattr: called on %pd\n",
                     dentry);
 
-       ret = inode_change_ok(inode, iattr);
+       ret = setattr_prepare(dentry, iattr);
        if (ret)
                goto out;
 
@@ -296,10 +296,7 @@ const struct inode_operations orangefs_file_inode_operations = {
        .set_acl = orangefs_set_acl,
        .setattr = orangefs_setattr,
        .getattr = orangefs_getattr,
-       .setxattr = generic_setxattr,
-       .getxattr = generic_getxattr,
        .listxattr = orangefs_listxattr,
-       .removexattr = generic_removexattr,
        .permission = orangefs_permission,
 };
 
@@ -438,7 +435,7 @@ struct inode *orangefs_new_inode(struct super_block *sb, struct inode *dir,
        inode->i_mode = mode;
        inode->i_uid = current_fsuid();
        inode->i_gid = current_fsgid();
-       inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+       inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
        inode->i_size = PAGE_SIZE;
        inode->i_rdev = dev;