Whamcloud - gitweb
LU-4430 mdt: check for MDS_FMODE_EXEC in mdt_mfd_open() 19/8719/2
authorJohn L. Hammond <john.hammond@intel.com>
Fri, 3 Jan 2014 23:42:08 +0000 (17:42 -0600)
committerOleg Drokin <oleg.drokin@intel.com>
Wed, 8 Jan 2014 04:14:42 +0000 (04:14 +0000)
In the error path of mdt_mfd_open() check for MDS_FMODE_EXEC rather
than FMODE_EXEC in the open flags.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I04c53eb1af0fdeeb2c2b0c2f2ef1340b247921d8
Reviewed-on: http://review.whamcloud.com/8719
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/mdt/mdt_open.c

index 30c80e7..f5a244a 100644 (file)
@@ -811,13 +811,14 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p,
         RETURN(rc);
 
 err_out:
-        if (flags & FMODE_WRITE)
-                        /* XXX We also need to close io epoch here.
-                         * See LU-1220 - green */
-                mdt_write_put(o);
-        else if (flags & FMODE_EXEC)
-                mdt_write_allow(o);
-        return rc;
+       if (flags & FMODE_WRITE)
+               /* XXX We also need to close io epoch here.
+                * See LU-1220 - green */
+               mdt_write_put(o);
+       else if (flags & MDS_FMODE_EXEC)
+               mdt_write_allow(o);
+
+       return rc;
 }
 
 int mdt_finish_open(struct mdt_thread_info *info,