ceph: zero unused message header, footer fields

[sfrench/cifs-2.6.git] / fs / attr.c

diff --git a/fs/attr.c b/fs/attr.c
index 96d394bdaddfa29e52b74d815dd5842e87cb6820..0815e93bb487e0651619d942b6bd78d7fe6a2e89 100644 (file)
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -12,7 +12,6 @@
 #include <linux/capability.h>
 #include <linux/fsnotify.h>
 #include <linux/fcntl.h>
-#include <linux/quotaops.h>
 #include <linux/security.h>
 
 /* Taken over from the old code... */
@@ -82,7 +81,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
        if (inode->i_size < offset) {
                unsigned long limit;
 
-               limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
+               limit = rlimit(RLIMIT_FSIZE);
                if (limit != RLIM_INFINITY && offset > limit)
                        goto out_sig;
                if (offset > inode->i_sb->s_maxbytes)
@@ -212,14 +211,8 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
                error = inode->i_op->setattr(dentry, attr);
        } else {
                error = inode_change_ok(inode, attr);
-               if (!error) {
-                       if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
-                           (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
-                               error = vfs_dq_transfer(inode, attr) ?
-                                       -EDQUOT : 0;
-                       if (!error)
-                               error = inode_setattr(inode, attr);
-               }
+               if (!error)
+                       error = inode_setattr(inode, attr);
        }
 
        if (ia_valid & ATTR_SIZE)