LU-4098 lmv: kernel crash due to misconfigured MDT

[fs/lustre-release.git] / lustre / liblustre / super.c

diff --git a/lustre/liblustre/super.c b/lustre/liblustre/super.c
index af978cb..9e6972f 100644 (file)
--- a/lustre/liblustre/super.c
+++ b/lustre/liblustre/super.c
@@ -77,18 +77,18 @@ static int ll_permission(struct inode *inode, int mask)
         if ((mode & mask & (MAY_READ|MAY_WRITE|MAY_EXEC)) == mask)
                 return 0;
 
-       if ((mask & (MAY_READ|MAY_WRITE)) ||
-           (st->st_mode & S_IXUGO))
-               if (cfs_capable(CAP_DAC_OVERRIDE))
-                       return 0;
-
-       if (mask == MAY_READ ||
-           (S_ISDIR(st->st_mode) && !(mask & MAY_WRITE))) {
-               if (cfs_capable(CAP_DAC_READ_SEARCH))
-                       return 0;
-       }
+        if ((mask & (MAY_READ|MAY_WRITE)) ||
+            (st->st_mode & S_IXUGO))
+                if (cfs_capable(CFS_CAP_DAC_OVERRIDE))
+                        return 0;
+
+        if (mask == MAY_READ ||
+            (S_ISDIR(st->st_mode) && !(mask & MAY_WRITE))) {
+                if (cfs_capable(CFS_CAP_DAC_READ_SEARCH))
+                        return 0;
+        }
 
-       return -EACCES;
+        return -EACCES;
 }
 
 static void llu_fsop_gone(struct filesys *fs)
@@ -572,7 +572,7 @@ static int inode_setattr(struct inode * inode, struct iattr * attr)
        if (ia_valid & ATTR_MODE) {
                st->st_mode = attr->ia_mode;
                if (!in_group_p(st->st_gid) &&
-                   !cfs_capable(CAP_FSETID))
+                   !cfs_capable(CFS_CAP_FSETID))
                        st->st_mode &= ~S_ISGID;
        }
         /* mark_inode_dirty(inode); */
@@ -743,13 +743,13 @@ int llu_setattr_raw(struct inode *inode, struct iattr *attr)
                                 if (current->fsuid != st->st_uid &&
                                     (rc = ll_permission(inode, MAY_WRITE)) != 0)
                                         RETURN(rc);
-                       } else {
-                               /* from inode_change_ok() */
-                               if (current->fsuid != st->st_uid &&
-                                   !cfs_capable(CAP_FOWNER))
-                                       RETURN(-EPERM);
-                       }
-               }
+                        } else {
+                                /* from inode_change_ok() */
+                                if (current->fsuid != st->st_uid &&
+                                    !cfs_capable(CFS_CAP_FOWNER))
+                                        RETURN(-EPERM);
+                        }
+                }
 
 
                 /* Won't invoke llu_vmtruncate(), as we already cleared
@@ -1345,7 +1345,7 @@ static int llu_file_flock(struct inode *ino,
                 if (lmv->desc.ld_tgt_count < 1)
                         RETURN(rc = -ENODEV);
 
-               if (lmv->tgts[0] && lmv->tgts[0]->ltd_exp != NULL)
+               if (lmv->tgts[0] != NULL && lmv->tgts[0]->ltd_exp != NULL)
                        rc = ldlm_cli_enqueue(lmv->tgts[0]->ltd_exp, NULL,
                                              &einfo, &res_id, &flock, &flags,
                                              NULL, 0, LVB_T_NONE, &lockh, 0);