From 6cf28cf0926a290255ec9397e2b669dba1a8b37e Mon Sep 17 00:00:00 2001
From: rcorreia <rcorreia>
Date: Wed, 17 Jun 2009 16:43:08 +0000
Subject: [PATCH] Branch b_hd_kdmu b=17577

Fix declaration of xattr set operation (bug found by AlexG).
---
 lustre/dmu-osd/udmu.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lustre/dmu-osd/udmu.c b/lustre/dmu-osd/udmu.c
index 32f8e10..64a8b50 100644
--- a/lustre/dmu-osd/udmu.c
+++ b/lustre/dmu-osd/udmu.c
@@ -1083,8 +1083,10 @@ void udmu_xattr_declare_set(udmu_objset_t *uos, dmu_buf_t *db,
         uint64_t xa_data_obj;
 
         if (zp->zp_xattr == 0) {
-                dmu_tx_hold_bonus(tx, DMU_NEW_OBJECT); /* xattr zap */
-                dmu_tx_hold_bonus(tx, DMU_NEW_OBJECT); /* xattr value obj */
+                /* xattr zap + entry */
+                dmu_tx_hold_zap(tx, DMU_NEW_OBJECT, TRUE, (char *) name);
+                /* xattr value obj */
+                dmu_tx_hold_bonus(tx, DMU_NEW_OBJECT);
                 dmu_tx_hold_write(tx, DMU_NEW_OBJECT, 0, vallen);
                 return;
         }
@@ -1118,7 +1120,7 @@ void udmu_xattr_declare_set(udmu_objset_t *uos, dmu_buf_t *db,
 
 /*
  * Set an extended attribute.
- * This transaction must have called udmu_tx_declare_xattr_set() first.
+ * This transaction must have called udmu_xattr_declare_set() first.
  *
  * Returns 0 on success or a positive error number on failure.
  *
@@ -1221,7 +1223,7 @@ void udmu_xattr_declare_del(udmu_objset_t *uos, dmu_buf_t *db,
 
 /*
  * Delete an extended attribute.
- * This transaction must have called udmu_tx_declare_xattr_del() first.
+ * This transaction must have called udmu_xattr_declare_del() first.
  *
  * Returns 0 on success or a positive error number on failure.
  *
-- 
1.8.3.1