Fix sign-extention problem with ll_extent_lock() error return codes on 64-bit

arches.  They were being stored in an ldlm_error_t (an enum, apparently an
unsigned int) instead of an int (ll_extent_lock() does not return LDLM error
codes), and when returned in a 64-bit ssize_t they were 2^32 - errno instead
of a negative number.
b=3043

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index dc982c2..9fd0f1a 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -691,7 +691,7 @@ static ssize_t ll_file_read(struct file *filp, char *buf, size_t count,
         struct lov_stripe_md *lsm = lli->lli_smd;
         struct lustre_handle lockh = { 0 };
         ldlm_policy_data_t policy;
-        ldlm_error_t err;
+        int rc;
         ssize_t retval;
         __u64 kms;
         ENTRY;
@@ -712,9 +712,9 @@ static ssize_t ll_file_read(struct file *filp, char *buf, size_t count,
         policy.l_extent.start = *ppos;
         policy.l_extent.end = *ppos + count - 1;
 
-        err = ll_extent_lock(fd, inode, lsm, LCK_PR, &policy, &lockh, 0);
-        if (err != ELDLM_OK)
-                RETURN(err);
+        rc = ll_extent_lock(fd, inode, lsm, LCK_PR, &policy, &lockh, 0);
+        if (rc != 0)
+                RETURN(rc);
 
         kms = lov_merge_size(lsm, 1);
         if (*ppos + count - 1 > kms) {
@@ -757,7 +757,7 @@ static ssize_t ll_file_write(struct file *file, const char *buf, size_t count,
         struct lustre_handle lockh = { 0 };
         ldlm_policy_data_t policy;
         loff_t maxbytes = ll_file_maxbytes(inode);
-        ldlm_error_t err;
+        int rc;
         ssize_t retval;
         ENTRY;
         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),size="LPSZ",offset=%Ld\n",
@@ -784,9 +784,9 @@ static ssize_t ll_file_write(struct file *file, const char *buf, size_t count,
                 policy.l_extent.end = *ppos + count - 1;
         }
 
-        err = ll_extent_lock(fd, inode, lsm, LCK_PW, &policy, &lockh, 0);
-        if (err != ELDLM_OK)
-                RETURN(err);
+        rc = ll_extent_lock(fd, inode, lsm, LCK_PW, &policy, &lockh, 0);
+        if (rc != 0)
+                RETURN(0);
 
         /* this is ok, g_f_w will overwrite this under i_sem if it races
          * with a local truncate, it just makes our maxbyte checking easier */
@@ -1067,11 +1067,12 @@ loff_t ll_file_seek(struct file *file, loff_t offset, int origin)
 
         lprocfs_counter_incr(ll_i2sbi(inode)->ll_stats, LPROC_LL_LLSEEK);
         if (origin == 2) { /* SEEK_END */
-                ldlm_error_t err;
                 ldlm_policy_data_t policy = { .l_extent = {0, OBD_OBJECT_EOF }};
-                err = ll_extent_lock(fd, inode, lsm, LCK_PR, &policy, &lockh,0);
-                if (err != ELDLM_OK)
-                        RETURN(err);
+                int rc;
+
+                rc = ll_extent_lock(fd, inode, lsm, LCK_PR, &policy, &lockh,0);
+                if (rc != 0)
+                        RETURN(rc);
 
                 offset += inode->i_size;
         } else if (origin == 1) { /* SEEK_CUR */

diff --git a/lustre/llite/llite_close.c b/lustre/llite/llite_close.c
index 3e1c195..c213781 100644 (file)
--- a/lustre/llite/llite_close.c
+++ b/lustre/llite/llite_close.c
@@ -134,7 +134,7 @@ static void ll_close_done_writing(struct inode *inode)
 
         rc = ll_extent_lock(NULL, inode, lli->lli_smd, LCK_PW, &policy, &lockh,
                             ast_flags);
-        if (rc != ELDLM_OK) {
+        if (rc != 0) {
                 CERROR("lock acquisition failed (%d): unable to send "
                        "DONE_WRITING for inode %lu/%u\n", rc, inode->i_ino,
                        inode->i_generation);

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 2000356..94d5b5a 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -905,7 +905,7 @@ int ll_setattr_raw(struct inode *inode, struct iattr *attr)
                 rc = ll_extent_lock(NULL, inode, lsm, LCK_PW, &policy, &lockh,
                                     ast_flags);
                 down(&inode->i_sem);
-                if (rc != ELDLM_OK)
+                if (rc != 0)
                         RETURN(rc);
 
                 rc = vmtruncate(inode, attr->ia_size);