land b1_5 onto HEAD

[fs/lustre-release.git] / lustre / kernel_patches / patches / vfs_nointent-2.6-suse.patch

diff --git a/lustre/kernel_patches/patches/vfs_nointent-2.6-suse.patch b/lustre/kernel_patches/patches/vfs_nointent-2.6-suse.patch
index cfd0db0..184fa49 100644 (file)
--- a/lustre/kernel_patches/patches/vfs_nointent-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/vfs_nointent-2.6-suse.patch
@@ -304,7 +304,7 @@ Index: linux-2.6.5-12.1/fs/open.c
 +      
 +      if (inode->i_op->setattr_raw) {
 +              struct inode_operations *op = dentry->d_inode->i_op;
-+              
++
 +              newattrs.ia_mode = mode;
 +              newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
 +              newattrs.ia_valid |= ATTR_RAW;
@@ -401,7 +401,7 @@ Index: linux-2.6.5-12.1/fs/open.c
 +
 +              newattrs.ia_uid = user;
 +              newattrs.ia_gid = group;
-+              newattrs.ia_valid = ATTR_UID | ATTR_GID;
++              newattrs.ia_valid = ATTR_UID | ATTR_GID | ATTR_CTIME;
 +              newattrs.ia_valid |= ATTR_RAW;
 +              error = op->setattr_raw(inode, &newattrs);
 +              /* the file system wants to use normal vfs path now */