Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/cifs/export.c

1 files changed, 45 insertions, 13 deletions

diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 41c204771262..932797ba433b 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -328,7 +328,7 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
  *              dentry  - child directory dentry
  *
  * RETURN:      -EINVAL - if name is . or ..
- *              -EINVAL  - if . or .. exist but are invalid.
+ *              -EINVAL - if . or .. exist but are invalid.
  *              errors from subroutines
  *
  * note:
@@ -517,7 +517,7 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry)
         inode_dec_link_count(ip);
 
         /*
-         *      commit zero link count object
+         *      commit zero link count object
          */
         if (ip->i_nlink == 0) {
                 assert(!test_cflag(COMMIT_Nolink, ip));
@@ -596,7 +596,7 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry)
 /*
  * NAME:        commitZeroLink()
  *
- * FUNCTION:    for non-directory, called by jfs_remove(),
+ * FUNCTION:    for non-directory, called by jfs_remove(),
  *              truncate a regular file, directory or symbolic
  *              link to zero length. return 0 if type is not
  *              one of these.
@@ -676,7 +676,7 @@ static s64 commitZeroLink(tid_t tid, struct inode *ip)
 /*
  * NAME:        jfs_free_zero_link()
  *
- * FUNCTION:    for non-directory, called by iClose(),
+ * FUNCTION:    for non-directory, called by iClose(),
  *              free resources of a file from cache and WORKING map
  *              for a file previously committed with zero link count
  *              while associated with a pager object,
@@ -855,12 +855,12 @@ static int jfs_link(struct dentry *old_dentry,
  * NAME:        jfs_symlink(dip, dentry, name)
  *
  * FUNCTION:    creates a symbolic link to <symlink> by name <name>
- *                      in directory <dip>
+ *                      in directory <dip>
  *
- * PARAMETER:   dip         - parent directory vnode
- *                      dentry  - dentry of symbolic link
- *                      name    - the path name of the existing object
- *                                    that will be the source of the link
+ * PARAMETER:   dip     - parent directory vnode
+ *              dentry  - dentry of symbolic link
+ *              name    - the path name of the existing object
+ *                        that will be the source of the link
  *
  * RETURN:      errors from subroutines
  *
@@ -1052,9 +1052,9 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
 
 
 /*
- * NAME:        jfs_rename
+ * NAME:        jfs_rename
  *
- * FUNCTION:    rename a file or directory
+ * FUNCTION:    rename a file or directory
  */
 static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                struct inode *new_dir, struct dentry *new_dentry)
@@ -1331,9 +1331,9 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 
 
 /*
- * NAME:        jfs_mknod
+ * NAME:        jfs_mknod
  *
- * FUNCTION:    Create a special file (device)
+ * FUNCTION:    Create a special file (device)
  */
 static int jfs_mknod(struct inode *dir, struct dentry *dentry,
                 int mode, dev_t rdev)
@@ -1477,6 +1477,38 @@ static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, struc
         return dentry;
 }
 
+struct dentry *jfs_get_dentry(struct super_block *sb, void *vobjp)
+{
+        __u32 *objp = vobjp;
+        unsigned long ino = objp[0];
+        __u32 generation = objp[1];
+        struct inode *inode;
+        struct dentry *result;
+
+        if (ino == 0)
+                return ERR_PTR(-ESTALE);
+        inode = iget(sb, ino);
+        if (inode == NULL)
+                return ERR_PTR(-ENOMEM);
+
+        if (is_bad_inode(inode) ||
+            (generation && inode->i_generation != generation)) {
+                result = ERR_PTR(-ESTALE);
+                goto out_iput;
+        }
+
+        result = d_alloc_anon(inode);
+        if (!result) {
+                result = ERR_PTR(-ENOMEM);
+                goto out_iput;
+        }
+        return result;
+
+ out_iput:
+        iput(inode);
+        return result;
+}
+
 struct dentry *jfs_get_parent(struct dentry *dentry)
 {
         struct super_block *sb = dentry->d_inode->i_sb;