Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://github.com/martinbrandenburg/linux
Pull OrangeFS fixes from Martin Brandenburg:
"Two bugfixes for OrangeFS.
One is a reference counting bug and the other is a typo in client
minimum version"
* tag 'for-linus' of git://github.com/martinbrandenburg/linux:
orangefs: minimum userspace version is 2.9.3
orangefs: don't put readdir slot twice
+4
-6
+3
-5
fs/orangefs/dir.c
+3
-5
fs/orangefs/dir.c
···
235
235
if (ret == -EIO && op_state_purged(new_op)) {
236
236
gossip_err("%s: Client is down. Aborting readdir call.\n",
237
237
__func__);
238
-
goto out_slot;
238
+
goto out_free_op;
239
239
}
240
240
241
241
if (ret < 0 || new_op->downcall.status != 0) {
···
244
244
new_op->downcall.status);
245
245
if (ret >= 0)
246
246
ret = new_op->downcall.status;
247
-
goto out_slot;
247
+
goto out_free_op;
248
248
}
249
249
250
250
dents_buf = new_op->downcall.trailer_buf;
251
251
if (dents_buf == NULL) {
252
252
gossip_err("Invalid NULL buffer in readdir response\n");
253
253
ret = -ENOMEM;
254
-
goto out_slot;
254
+
goto out_free_op;
255
255
}
256
256
257
257
bytes_decoded = decode_dirents(dents_buf, new_op->downcall.trailer_size,
···
363
363
out_vfree:
364
364
gossip_debug(GOSSIP_DIR_DEBUG, "vfree %p\n", dents_buf);
365
365
vfree(dents_buf);
366
-
out_slot:
367
-
orangefs_readdir_index_put(buffer_index);
368
366
out_free_op:
369
367
op_release(new_op);
370
368
gossip_debug(GOSSIP_DIR_DEBUG, "orangefs_readdir returning %d\n", ret);
+1
-1
fs/orangefs/protocol.h
+1
-1
fs/orangefs/protocol.h
···
407
407
* space. Zero signifies the upstream version of the kernel module.
408
408
*/
409
409
#define ORANGEFS_KERNEL_PROTO_VERSION 0
410
-
#define ORANGEFS_MINIMUM_USERSPACE_VERSION 20904
410
+
#define ORANGEFS_MINIMUM_USERSPACE_VERSION 20903
411
411
412
412
/*
413
413
* describes memory regions to map in the ORANGEFS_DEV_MAP ioctl.