diff options
Diffstat (limited to 'sys-cluster/lustre/files/0012-LU-3974-llite-use-new-struct-dir_context.patch')
| -rw-r--r-- | sys-cluster/lustre/files/0012-LU-3974-llite-use-new-struct-dir_context.patch | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys-cluster/lustre/files/0012-LU-3974-llite-use-new-struct-dir_context.patch b/sys-cluster/lustre/files/0012-LU-3974-llite-use-new-struct-dir_context.patch index 29696dd1c..7a5b843e3 100644 --- a/sys-cluster/lustre/files/0012-LU-3974-llite-use-new-struct-dir_context.patch +++ b/sys-cluster/lustre/files/0012-LU-3974-llite-use-new-struct-dir_context.patch @@ -1,4 +1,4 @@ -From a93c1a0d6dfaa1a17e0806c5a3f71996af15fb20 Mon Sep 17 00:00:00 2001 +From da6a877ec27753ce11499d1bde68d392f90179c4 Mon Sep 17 00:00:00 2001 From: James Simmons <uja.ornl@gmail.com> Date: Mon, 20 Jan 2014 21:23:00 -0500 Subject: [PATCH 12/13] LU-3974 llite: use new struct dir_context @@ -9,6 +9,9 @@ kernel a new struct dir_context was introduced to minimize the impact of future expansion. This patch addresses this change. +Conflicts: + lustre/llite/dir.c + Signed-off-by: James Simmons <uja.ornl@gmail.com> Change-Id: Ib42bf8cb06635a2a64e63b294d79e66ac82a1a5b Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org> @@ -181,7 +184,7 @@ index dc5d623..5009934 100644 + .fsync = ll_fsync, }; diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h -index 5c22795..251a218 100644 +index 92b278e..c477b4c 100644 --- a/lustre/llite/llite_internal.h +++ b/lustre/llite/llite_internal.h @@ -91,9 +91,12 @@ extern struct file_operations ll_pgcache_seq_fops; @@ -200,7 +203,7 @@ index 5c22795..251a218 100644 }; /* llite setxid/access permission for user on remote client */ -@@ -718,8 +721,13 @@ static void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count) {} +@@ -719,8 +722,13 @@ static void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count) {} /* llite/dir.c */ extern struct file_operations ll_dir_operations; extern struct inode_operations ll_dir_inode_operations; |