]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: lustre: llite: return from ll_adjust_lum() if lump is NULL
authorBobi Jam <bobijam.xu@intel.com>
Mon, 16 Apr 2018 04:14:59 +0000 (00:14 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Apr 2018 12:57:40 +0000 (14:57 +0200)
No need to check several times if lump is NULL. Just test once and
return 0 if NULL.

Signed-off-by: Bobi Jam <bobijam.xu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-9484
Reviewed-on: https://review.whamcloud.com/27126
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Niu Yawei <yawei.niu@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/llite/xattr.c

index 78ce85bc6b26c83566e49ddce39910cba14d4a86..56ac07ef3f4ae076841993ad5f1e44b262639504 100644 (file)
@@ -190,15 +190,18 @@ static int ll_adjust_lum(struct inode *inode, struct lov_user_md *lump)
 {
        int rc = 0;
 
+       if (!lump)
+               return 0;
+
        /* Attributes that are saved via getxattr will always have
         * the stripe_offset as 0.  Instead, the MDS should be
         * allowed to pick the starting OST index.   b=17846
         */
-       if (lump && lump->lmm_stripe_offset == 0)
+       if (lump->lmm_stripe_offset == 0)
                lump->lmm_stripe_offset = -1;
 
        /* Avoid anyone directly setting the RELEASED flag. */
-       if (lump && (lump->lmm_pattern & LOV_PATTERN_F_RELEASED)) {
+       if (lump->lmm_pattern & LOV_PATTERN_F_RELEASED) {
                /* Only if we have a released flag check if the file
                 * was indeed archived.
                 */