X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Fvfs_intent-2.6-vanilla.patch;h=55983140b491b7e7d7b6fe5a78b10f5a38156c1b;hb=89f9a5bced24ecb7c84040a1ed88dcef4384f7c6;hp=6cfae66b588f809f9c68349f90d91cb9ed228f10;hpb=a487457bb00b5a862d0f51071b6c8da7aae99390;p=fs%2Flustre-release.git

diff --git a/lustre/kernel_patches/patches/vfs_intent-2.6-vanilla.patch b/lustre/kernel_patches/patches/vfs_intent-2.6-vanilla.patch
index 6cfae66..5598314 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.6-vanilla.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.6-vanilla.patch
@@ -634,9 +634,9 @@ Index: linux-2.6.7/include/linux/dcache.h
  	int nr_unused;
 Index: linux-2.6.7/include/linux/fs.h
 ===================================================================
---- linux-2.6.7.orig/include/linux/fs.h	2004-08-26 17:12:41.000000000 +0400
-+++ linux-2.6.7/include/linux/fs.h	2005-01-18 11:27:18.092496832 +0300
-@@ -74,6 +74,7 @@
+--- linux-2.6.7.old/include/linux/fs.h	2005-01-31 14:27:16.000000000 +0800
++++ linux-2.6.7/include/linux/fs.h	2005-01-31 14:32:19.000000000 +0800
+@@ -74,6 +74,7 @@ extern int leases_enable, dir_notify_ena
  
  #define FMODE_READ 1
  #define FMODE_WRITE 2
@@ -644,16 +644,21 @@ Index: linux-2.6.7/include/linux/fs.h
  
  #define RW_MASK		1
  #define RWA_MASK	2
-@@ -250,6 +251,8 @@
+@@ -250,6 +251,13 @@ typedef void (dio_iodone_t)(struct inode
  #define ATTR_ATTR_FLAG	1024
  #define ATTR_KILL_SUID	2048
  #define ATTR_KILL_SGID	4096
 +#define ATTR_RAW       	8192    /* file system, not vfs will massage attrs */
 +#define ATTR_FROM_OPEN 	16384    /* called from open path, ie O_TRUNC */
++
++#define ATTR_CTIME_SET 0x2000
++/* ea support  */
++#define ATTR_EA 0x40000
++#define ATTR_EA_RM 0x80000
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
-@@ -446,6 +449,7 @@
+@@ -446,6 +454,7 @@ struct inode {
  	struct block_device	*i_bdev;
  	struct cdev		*i_cdev;
  	int			i_cindex;
@@ -661,7 +666,7 @@ Index: linux-2.6.7/include/linux/fs.h
  
  	unsigned long		i_dnotify_mask; /* Directory notify events */
  	struct dnotify_struct	*i_dnotify; /* for directory notifications */
-@@ -579,6 +583,7 @@
+@@ -579,6 +588,7 @@ struct file {
  	spinlock_t		f_ep_lock;
  #endif /* #ifdef CONFIG_EPOLL */
  	struct address_space	*f_mapping;
@@ -669,7 +674,7 @@ Index: linux-2.6.7/include/linux/fs.h
  };
  extern spinlock_t files_lock;
  #define file_list_lock() spin_lock(&files_lock);
-@@ -903,7 +908,9 @@
+@@ -903,7 +913,9 @@ struct inode_operations {
  	void (*truncate) (struct inode *);
  	int (*permission) (struct inode *, int, struct nameidata *);
  	int (*setattr) (struct dentry *, struct iattr *);
@@ -679,7 +684,7 @@ Index: linux-2.6.7/include/linux/fs.h
  	int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
  	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
  	ssize_t (*listxattr) (struct dentry *, char *, size_t);
-@@ -943,6 +950,7 @@
+@@ -943,6 +955,7 @@ struct super_operations {
  	int (*remount_fs) (struct super_block *, int *, char *);
  	void (*clear_inode) (struct inode *);
  	void (*umount_begin) (struct super_block *);
@@ -687,7 +692,7 @@ Index: linux-2.6.7/include/linux/fs.h
  
  	int (*show_options)(struct seq_file *, struct vfsmount *);
  };
-@@ -1131,6 +1139,7 @@
+@@ -1131,6 +1144,7 @@ extern int unregister_filesystem(struct 
  extern struct vfsmount *kern_mount(struct file_system_type *);
  extern int may_umount_tree(struct vfsmount *);
  extern int may_umount(struct vfsmount *);
@@ -695,14 +700,14 @@ Index: linux-2.6.7/include/linux/fs.h
  extern long do_mount(char *, char *, char *, unsigned long, void *);
  
  extern int vfs_statfs(struct super_block *, struct kstatfs *);
-@@ -1195,6 +1204,7 @@
+@@ -1195,6 +1209,7 @@ static inline int break_lease(struct ino
  extern int do_truncate(struct dentry *, loff_t start);
  extern struct file *filp_open(const char *, int, int);
  extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
 +extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
  extern int filp_close(struct file *, fl_owner_t id);
  extern char * getname(const char __user *);
- 
+
 Index: linux-2.6.7/include/linux/namei.h
 ===================================================================
 --- linux-2.6.7.orig/include/linux/namei.h	2003-07-24 15:52:31.000000000 +0400