land b1_5 onto HEAD

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

diff --git a/lustre/kernel_patches/patches/vfs_lookup_in_file-2.6.patch b/lustre/kernel_patches/patches/vfs_lookup_in_file-2.6.patch
deleted file mode 100644 (file)
index 3665cbb..0000000
--- a/lustre/kernel_patches/patches/vfs_lookup_in_file-2.6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- linux-2.6.7.orig/fs/namei.c        2005-04-01 11:14:26.000000000 +0300
-+++ linux-2.6.7/fs/namei.c     2005-04-01 11:23:01.748305104 +0300
-@@ -762,6 +762,13 @@ last_component:
-                               inode = nd->dentry->d_inode;
-                               /* fallthrough */
-                       case 1:
-+                              if (lookup_flags & LOOKUP_DIRECTORY) {
-+                                      err = -ENOTDIR;
-+                                      if (!nd->dentry->d_inode->i_op ||
-+                                          !nd->dentry->d_inode->i_op->lookup) {
-+                                              goto return_err;
-+                                      }
-+                              }
-                               goto return_reval;
-               }
-               if (nd->dentry->d_op && nd->dentry->d_op->d_hash) {