b=14230

[fs/lustre-release.git] / lustre / mds / mds_xattr.c

diff --git a/lustre/mds/mds_xattr.c b/lustre/mds/mds_xattr.c
index f9681b3..ce3199d 100644 (file)
--- a/lustre/mds/mds_xattr.c
+++ b/lustre/mds/mds_xattr.c
@@ -129,25 +129,21 @@ static int mds_getxattr_internal(struct obd_device *obd,
 
         if (reqbody->valid & OBD_MD_FLXATTR) {
                 xattr_name = lustre_msg_string(req->rq_reqmsg, REQ_REC_OFF+1,0);
 
         if (reqbody->valid & OBD_MD_FLXATTR) {
                 xattr_name = lustre_msg_string(req->rq_reqmsg, REQ_REC_OFF+1,0);

-                DEBUG_REQ(D_INODE, req, "getxattr %s\n", xattr_name);
+                DEBUG_REQ(D_INODE, req, "getxattr %s", xattr_name);

 
                 if (inode->i_op && inode->i_op->getxattr) {
 
                 if (inode->i_op && inode->i_op->getxattr) {

-                        lock_24kernel();

                         rc = inode->i_op->getxattr(dentry, xattr_name,
                                                    buf, buflen);
                         rc = inode->i_op->getxattr(dentry, xattr_name,
                                                    buf, buflen);

-                        unlock_24kernel();

                 }
 
                 if (rc < 0 && rc != -ENODATA && rc != -EOPNOTSUPP &&
                     rc != -ERANGE)
                         CDEBUG(D_OTHER, "getxattr failed: %d\n", rc);
         } else if (reqbody->valid & OBD_MD_FLXATTRLS) {
                 }
 
                 if (rc < 0 && rc != -ENODATA && rc != -EOPNOTSUPP &&
                     rc != -ERANGE)
                         CDEBUG(D_OTHER, "getxattr failed: %d\n", rc);
         } else if (reqbody->valid & OBD_MD_FLXATTRLS) {

-                DEBUG_REQ(D_INODE, req, "listxattr\n");
+                DEBUG_REQ(D_INODE, req, "listxattr");

 
                 if (inode->i_op && inode->i_op->listxattr) {
 
                 if (inode->i_op && inode->i_op->listxattr) {

-                        lock_24kernel();

                         rc = inode->i_op->listxattr(dentry, buf, buflen);
                         rc = inode->i_op->listxattr(dentry, buf, buflen);

-                        unlock_24kernel();

                 }
                 if (rc < 0)
                         CDEBUG(D_OTHER, "listxattr failed: %d\n", rc);
                 }
                 if (rc < 0)
                         CDEBUG(D_OTHER, "listxattr failed: %d\n", rc);


@@ -170,7 +166,7 @@ int mds_getxattr(struct ptlrpc_request *req)
         struct lvfs_run_ctxt saved;
         struct dentry *de;
         struct mds_body *body;
         struct lvfs_run_ctxt saved;
         struct dentry *de;
         struct mds_body *body;

-        struct lvfs_ucred uc = { NULL, };
+        struct lvfs_ucred uc = {0,};

         int rc = 0;
         ENTRY;
 
         int rc = 0;
         ENTRY;
 


@@ -243,7 +239,7 @@ int mds_setxattr_internal(struct ptlrpc_request *req, struct mds_body *body)
                 GOTO(out, rc = -EPROTO);
         }
 
                 GOTO(out, rc = -EPROTO);
         }
 

-        DEBUG_REQ(D_INODE, req, "%sxattr %s\n",
+        DEBUG_REQ(D_INODE, req, "%sxattr %s",

                   body->valid & OBD_MD_FLXATTR ? "set" : "remove",
                   xattr_name);
 
                   body->valid & OBD_MD_FLXATTR ? "set" : "remove",
                   xattr_name);
 


@@ -261,7 +257,7 @@ int mds_setxattr_internal(struct ptlrpc_request *req, struct mds_body *body)
                 lockpart |= MDS_INODELOCK_LOOKUP;
 
         de = mds_fid2locked_dentry(obd, &body->fid1, NULL, LCK_EX,
                 lockpart |= MDS_INODELOCK_LOOKUP;
 
         de = mds_fid2locked_dentry(obd, &body->fid1, NULL, LCK_EX,

-                                   &lockh, NULL, 0, lockpart);
+                                   &lockh, lockpart);

         if (IS_ERR(de))
                 GOTO(out, rc = PTR_ERR(de));
 
         if (IS_ERR(de))
                 GOTO(out, rc = PTR_ERR(de));
 


@@ -289,18 +285,14 @@ int mds_setxattr_internal(struct ptlrpc_request *req, struct mds_body *body)
                                                        REQ_REC_OFF+2, xattrlen);
 
                         LOCK_INODE_MUTEX(inode);
                                                        REQ_REC_OFF+2, xattrlen);
 
                         LOCK_INODE_MUTEX(inode);

-                        lock_24kernel();

                         rc = inode->i_op->setxattr(de, xattr_name, xattr,
                                                    xattrlen, body->flags);
                         rc = inode->i_op->setxattr(de, xattr_name, xattr,
                                                    xattrlen, body->flags);

-                        unlock_24kernel();

                         UNLOCK_INODE_MUTEX(inode);
                 }
         } else if (body->valid & OBD_MD_FLXATTRRM) {
                 if (inode->i_op && inode->i_op->removexattr) {
                         LOCK_INODE_MUTEX(inode);
                         UNLOCK_INODE_MUTEX(inode);
                 }
         } else if (body->valid & OBD_MD_FLXATTRRM) {
                 if (inode->i_op && inode->i_op->removexattr) {
                         LOCK_INODE_MUTEX(inode);

-                        lock_24kernel();

                         rc = inode->i_op->removexattr(de, xattr_name);
                         rc = inode->i_op->removexattr(de, xattr_name);

-                        unlock_24kernel();

                         UNLOCK_INODE_MUTEX(inode);
                 }
         } else {
                         UNLOCK_INODE_MUTEX(inode);
                 }
         } else {


@@ -310,7 +302,7 @@ int mds_setxattr_internal(struct ptlrpc_request *req, struct mds_body *body)
 
         LASSERT(rc <= 0);
 out_trans:
 
         LASSERT(rc <= 0);
 out_trans:

-        err = mds_finish_transno(mds, inode, handle, req, rc, 0);
+        err = mds_finish_transno(mds, inode, handle, req, rc, 0, 0);

 
 out_dput:
         l_dput(de);
 
 out_dput:
         l_dput(de);


@@ -332,7 +324,7 @@ int mds_setxattr(struct ptlrpc_request *req)
         struct obd_device *obd = req->rq_export->exp_obd;
         struct lvfs_run_ctxt saved;
         struct mds_body *body;
         struct obd_device *obd = req->rq_export->exp_obd;
         struct lvfs_run_ctxt saved;
         struct mds_body *body;

-        struct lvfs_ucred uc = { NULL, };
+        struct lvfs_ucred uc = {0,};

         int rc;
         ENTRY;
 
         int rc;
         ENTRY;