Merge tag 'trace-v4.14-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...

[linux.git] / fs / orangefs / devorangefs-req.c

diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c
index c19f0787c9c65bddfc8b82ca7fad2f88549f2f91..2826859bdc2cb12149c1eed219ec65a1f01ad5d9 100644 (file)
--- a/fs/orangefs/devorangefs-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -461,13 +461,10 @@ static ssize_t orangefs_devreq_write_iter(struct kiocb *iocb,
        if (op->downcall.type != ORANGEFS_VFS_OP_READDIR)
                goto wakeup;
 
-       op->downcall.trailer_buf =
-               vmalloc(op->downcall.trailer_size);
-       if (op->downcall.trailer_buf == NULL) {
-               gossip_err("%s: failed trailer vmalloc.\n",
-                          __func__);
+       op->downcall.trailer_buf = vmalloc(op->downcall.trailer_size);
+       if (!op->downcall.trailer_buf)
                goto Enomem;
-       }
+
        memset(op->downcall.trailer_buf, 0, op->downcall.trailer_size);
        if (!copy_from_iter_full(op->downcall.trailer_buf,
                                 op->downcall.trailer_size, iter)) {