summaryrefslogtreecommitdiffstats
path: root/fs/exofs/ore_raid.h
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2014-11-19 18:06:30 +0100
committerJ. Bruce Fields <bfields@redhat.com>2014-11-19 18:06:30 +0100
commit56429e9b3be567a173bd05f5594faf8522c34d3a (patch)
treed218d430ed992cdfa42da084bf36e5aa3c2ecb26 /fs/exofs/ore_raid.h
parentnfsd: convert nfs4_file searches to use RCU (diff)
parentSUNRPC: Fix locking around callback channel reply receive (diff)
downloadlinux-56429e9b3be567a173bd05f5594faf8522c34d3a.tar.xz
linux-56429e9b3be567a173bd05f5594faf8522c34d3a.zip
merge nfs bugfixes into nfsd for-3.19 branch
In addition to nfsd bugfixes, there are some fixes in -rc5 for client bugs that can interfere with my testing.
Diffstat (limited to 'fs/exofs/ore_raid.h')
-rw-r--r--fs/exofs/ore_raid.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/exofs/ore_raid.h b/fs/exofs/ore_raid.h
index cf6375d82129..a6e746775570 100644
--- a/fs/exofs/ore_raid.h
+++ b/fs/exofs/ore_raid.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) from 2011
- * Boaz Harrosh <bharrosh@panasas.com>
+ * Boaz Harrosh <ooo@electrozaur.com>
*
* This file is part of the objects raid engine (ore).
*