summaryrefslogtreecommitdiff
path: root/fs/ocfs2/dir.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-23 11:47:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-23 11:47:13 -0800
commitfa7d9a1d286e6bab49ffa59cbd3c8b394ce54339 (patch)
treed6f472fbfc796b140213ae0906cc407978302f8e /fs/ocfs2/dir.c
parent20c759ca98468d96d1fff8bd5e6753f458dbbfbd (diff)
parent6d45c042f35ea9b27bf946380f74ff75d32280c9 (diff)
Merge tag 'nfs-for-4.5-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes and cleanups from Trond Myklebust: "Bugfixes: - pNFS/flexfiles: Fix an XDR encoding bug in layoutreturn - pNFS/flexfiles: Improve merging of errors in LAYOUTRETURN Cleanups: - NFS: Simplify nfs_request_add_commit_list() arguments" * tag 'nfs-for-4.5-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: pNFS/flexfiles: Fix an XDR encoding bug in layoutreturn NFS: Simplify nfs_request_add_commit_list() arguments pNFS/flexfiles: Improve merging of errors in LAYOUTRETURN
Diffstat (limited to 'fs/ocfs2/dir.c')
0 files changed, 0 insertions, 0 deletions