Merge branch 'tp/ibm_next_leo_morefixes' into ibm_next_tmp

phdeniel · May 16, 2012 · ec64a0c · ec64a0c
2 parents f2e347e + 3d9857a
commit ec64a0c
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Protocols/NFS/nfs4_op_open_downgrade.c b/src/Protocols/NFS/nfs4_op_open_downgrade.c
@@ -94,10 +94,18 @@ int nfs4_op_open_downgrade(struct nfs_argop4 *op,
    * Do basic checks on a filehandle
    * Commit is done only on a file
    */
-  res_OPEN_DOWNGRADE4.status = nfs4_sanity_check_FH(data, REGULAR_FILE);
+  res_OPEN_DOWNGRADE4.status = nfs4_sanity_check_FH(data, 0LL);
   if(res_OPEN_DOWNGRADE4.status != NFS4_OK)
     return res_OPEN_DOWNGRADE4.status;
 
+  /* Commit is done only on a file */
+  if(data->current_filetype != REGULAR_FILE)
+    {
+      res_OPEN_DOWNGRADE4.status = NFS4ERR_INVAL;
+      return res_OPEN_DOWNGRADE4.status;
+    }
+
+
   /* Check stateid correctness and get pointer to state */
   if((rc = nfs4_Check_Stateid(&arg_OPEN_DOWNGRADE4.open_stateid,
                               data->current_entry,