LU-935 quota: break early when b/i_unit_sz exceeded upper limit

[fs/lustre-release.git] / lustre / llite / xattr.c

diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
index b0780d2..013a1b3 100644 (file)
--- a/lustre/llite/xattr.c
+++ b/lustre/llite/xattr.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -45,7 +45,6 @@
 #include <lustre_lite.h>
 #include <lustre_dlm.h>
 #include <lustre_ver.h>
-//#include <lustre_mdc.h>
 #include <lustre_acl.h>
 
 #include "llite_internal.h"
@@ -432,20 +431,41 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name,
                 struct ptlrpc_request *request = NULL;
                 int rc = 0, lmmsize = 0;
 
-                if (S_ISREG(inode->i_mode)) {
-                        rc = ll_lov_getstripe_ea_info(dentry->d_parent->d_inode,
-                                                      dentry->d_name.name, &lmm,
+                if (!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode))
+                        return -ENODATA;
+
+                if (size == 0 && S_ISDIR(inode->i_mode)) {
+                        /* XXX directory EA is fix for now, optimize to save
+                         * RPC transfer */
+                        GOTO(out, rc = sizeof(struct lov_user_md));
+                }
+
+                if (!ll_i2info(inode)->lli_smd) {
+                        if (S_ISDIR(inode->i_mode)) {
+                                rc = ll_dir_getstripe(inode, &lmm,
                                                       &lmmsize, &request);
-                } else if (S_ISDIR(inode->i_mode)) {
-                        rc = ll_dir_getstripe(inode, &lmm, &lmmsize, &request);
+                        } else {
+                                rc = -ENODATA;
+                        }
                 } else {
-                        rc = -ENODATA;
+                        /* LSM is present already after lookup/getattr call.
+                         * we need to grab layout lock once it is implemented */
+                        rc = obd_packmd(ll_i2dtexp(inode), &lmm,
+                                        ll_i2info(inode)->lli_smd);
+                        lmmsize = rc;
                 }
 
                 if (rc < 0)
                        GOTO(out, rc);
-                if (size == 0)
-                       GOTO(out, rc = lmmsize);
+
+                if (size == 0) {
+                        /* used to call ll_get_max_mdsize() forward to get
+                         * the maximum buffer size, while some apps (such as
+                         * rsync 3.0.x) care much about the exact xattr value
+                         * size */
+                        rc = lmmsize;
+                        GOTO(out, rc);
+                }
 
                 if (size < lmmsize) {
                         CERROR("server bug: replied size %d > %d for %s (%s)\n",
@@ -458,7 +478,10 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name,
 
                 rc = lmmsize;
 out:
-                ptlrpc_req_finished(request);
+                if (request)
+                        ptlrpc_req_finished(request);
+                else if (lmm)
+                        obd_free_diskmd(ll_i2dtexp(inode), &lmm);
                 return(rc);
         }
 
@@ -481,6 +504,8 @@ ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size)
         ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_LISTXATTR, 1);
 
         rc = ll_getxattr_common(inode, NULL, buffer, size, OBD_MD_FLXATTRLS);
+        if (rc < 0)
+                GOTO(out, rc);
 
         if (S_ISREG(inode->i_mode)) {
                 struct ll_inode_info *lli = ll_i2info(inode);
@@ -494,7 +519,7 @@ ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size)
 
         if (rc2 < 0) {
                 GOTO(out, rc2 = 0);
-        } else {
+        } else if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)) {
                 const int prefix_len = sizeof(XATTR_LUSTRE_PREFIX) - 1;
                 const size_t name_len   = sizeof("lov") - 1;
                 const size_t total_len  = prefix_len + name_len + 1;