From dc34d1f9a34555938f7ab701805709c37120a890 Mon Sep 17 00:00:00 2001 From: nikita Date: Wed, 21 Jun 2006 10:57:53 +0000 Subject: [PATCH] iam: adding missing chunk to ext3-iam-uapi.patch --- .../kernel_patches/patches/ext3-iam-separate.patch | 4 ++-- lustre/kernel_patches/patches/ext3-iam-uapi.patch | 26 ++++++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/lustre/kernel_patches/patches/ext3-iam-separate.patch b/lustre/kernel_patches/patches/ext3-iam-separate.patch index 09815ea..b0fb857 100644 --- a/lustre/kernel_patches/patches/ext3-iam-separate.patch +++ b/lustre/kernel_patches/patches/ext3-iam-separate.patch @@ -1,7 +1,7 @@ Index: iam/fs/ext3/Makefile =================================================================== --- iam.orig/fs/ext3/Makefile 2006-05-31 20:24:32.000000000 +0400 -+++ iam/fs/ext3/Makefile 2006-06-21 02:00:09.000000000 +0400 ++++ iam/fs/ext3/Makefile 2006-06-21 14:51:19.000000000 +0400 @@ -6,7 +6,7 @@ obj-$(CONFIG_EXT3_FS) += ext3.o ext3-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \ @@ -4125,7 +4125,7 @@ Index: iam/fs/ext3/namei.c Index: iam/include/linux/lustre_iam.h =================================================================== --- iam.orig/include/linux/lustre_iam.h 2006-05-31 20:24:32.000000000 +0400 -+++ iam/include/linux/lustre_iam.h 2006-06-21 02:00:09.000000000 +0400 ++++ iam/include/linux/lustre_iam.h 2006-06-21 14:51:19.000000000 +0400 @@ -1,9 +1,68 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: diff --git a/lustre/kernel_patches/patches/ext3-iam-uapi.patch b/lustre/kernel_patches/patches/ext3-iam-uapi.patch index 0855222..9b13253 100644 --- a/lustre/kernel_patches/patches/ext3-iam-uapi.patch +++ b/lustre/kernel_patches/patches/ext3-iam-uapi.patch @@ -1,7 +1,7 @@ Index: iam/fs/ext3/Makefile =================================================================== ---- iam.orig/fs/ext3/Makefile 2006-06-21 02:00:09.000000000 +0400 -+++ iam/fs/ext3/Makefile 2006-06-21 02:00:09.000000000 +0400 +--- iam.orig/fs/ext3/Makefile 2006-06-21 14:51:19.000000000 +0400 ++++ iam/fs/ext3/Makefile 2006-06-21 14:51:19.000000000 +0400 @@ -6,7 +6,7 @@ obj-$(CONFIG_EXT3_FS) += ext3.o ext3-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \ @@ -13,8 +13,8 @@ Index: iam/fs/ext3/Makefile ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o Index: iam/fs/ext3/file.c =================================================================== ---- iam.orig/fs/ext3/file.c 2006-06-21 02:00:09.000000000 +0400 -+++ iam/fs/ext3/file.c 2006-06-21 02:00:09.000000000 +0400 +--- iam.orig/fs/ext3/file.c 2006-06-21 14:51:19.000000000 +0400 ++++ iam/fs/ext3/file.c 2006-06-21 14:51:19.000000000 +0400 @@ -23,6 +23,7 @@ #include #include @@ -50,7 +50,7 @@ Index: iam/fs/ext3/file.c Index: iam/fs/ext3/iam-uapi.c =================================================================== --- iam.orig/fs/ext3/iam-uapi.c 2004-04-06 17:27:52.000000000 +0400 -+++ iam/fs/ext3/iam-uapi.c 2006-06-21 02:00:09.000000000 +0400 ++++ iam/fs/ext3/iam-uapi.c 2006-06-21 14:51:19.000000000 +0400 @@ -0,0 +1,348 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: @@ -400,10 +400,22 @@ Index: iam/fs/ext3/iam-uapi.c + result = -ENOENT; + return result; +} +Index: iam/fs/ext3/ioctl.c +=================================================================== +--- iam.orig/fs/ext3/ioctl.c 2006-06-21 14:51:19.000000000 +0400 ++++ iam/fs/ext3/ioctl.c 2006-06-21 14:51:19.000000000 +0400 +@@ -250,6 +250,6 @@ flags_err: + + + default: +- return -ENOTTY; ++ return iam_uapi_ioctl(inode, filp, cmd, arg); + } + } Index: iam/include/linux/lustre_iam.h =================================================================== ---- iam.orig/include/linux/lustre_iam.h 2006-06-21 02:00:09.000000000 +0400 -+++ iam/include/linux/lustre_iam.h 2006-06-21 02:00:09.000000000 +0400 +--- iam.orig/include/linux/lustre_iam.h 2006-06-21 14:51:19.000000000 +0400 ++++ iam/include/linux/lustre_iam.h 2006-06-21 14:51:19.000000000 +0400 @@ -30,9 +30,6 @@ #ifndef __LINUX_LUSTRE_IAM_H__ #define __LINUX_LUSTRE_IAM_H__ -- 1.8.3.1