LU-433 ldiskfs: remove jbd2-jcberr patch from kernel

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

diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
index 567cd82..cb1a2f0 100644 (file)
--- a/lustre/llite/xattr.c
+++ b/lustre/llite/xattr.c
@@ -28,6 +28,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -45,7 +47,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"
@@ -435,12 +436,10 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name,
                 if (!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode))
                         return -ENODATA;
 
-                if (size == 0) {
-                        /* size == 0 just ask for buffer size */
-                        rc = ll_get_max_mdsize(ll_i2sbi(inode), &lmmsize);
-                        if (rc == 0)
-                                rc = lmmsize;
-                        GOTO(out, rc);
+                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) {
@@ -461,6 +460,15 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name,
                 if (rc < 0)
                        GOTO(out, rc);
 
+                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",
                                lmmsize, (int)size, dentry->d_name.name, name);
@@ -502,10 +510,7 @@ ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size)
                 GOTO(out, rc);
 
         if (S_ISREG(inode->i_mode)) {
-                struct ll_inode_info *lli = ll_i2info(inode);
-                struct lov_stripe_md *lsm = NULL;
-                lsm = lli->lli_smd;
-                if (lsm == NULL)
+                if (ll_i2info(inode)->lli_smd == NULL)
                         rc2 = -1;
         } else if (S_ISDIR(inode->i_mode)) {
                 rc2 = ll_dir_getstripe(inode, &lmm, &lmmsize, &request);