[NETFILTER]: nf_conntrack: add NetBIOS name service helper port

[linux-2.6] / fs / gfs2 / ops_export.c

diff --git a/fs/gfs2/ops_export.c b/fs/gfs2/ops_export.c
index eacc1c092f91f12ab82a4b0985f47afb259b16a8..86127d93bd35f6f846f7d5b46f53cfd4fa0ccb53 100644 (file)
--- a/fs/gfs2/ops_export.c
+++ b/fs/gfs2/ops_export.c
@@ -4,7 +4,7 @@
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
 #include <linux/sched.h>
@@ -14,9 +14,9 @@
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
+#include <linux/lm_interface.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "dir.h"
 #include "glock.h"
@@ -34,30 +34,34 @@ static struct dentry *gfs2_decode_fh(struct super_block *sb,
                                                       struct dentry *dentry),
                                     void *context)
 {
-       struct gfs2_inum this, parent;
+       struct gfs2_fh_obj fh_obj;
+       struct gfs2_inum *this, parent;
 
        if (fh_type != fh_len)
                return NULL;
 
+       this            = &fh_obj.this;
+       fh_obj.imode    = DT_UNKNOWN;
        memset(&parent, 0, sizeof(struct gfs2_inum));
 
        switch (fh_type) {
-       case 8:
-               parent.no_formal_ino = ((uint64_t)be32_to_cpu(fh[4])) << 32;
+       case GFS2_LARGE_FH_SIZE:
+               parent.no_formal_ino = ((u64)be32_to_cpu(fh[4])) << 32;
                parent.no_formal_ino |= be32_to_cpu(fh[5]);
-               parent.no_addr = ((uint64_t)be32_to_cpu(fh[6])) << 32;
+               parent.no_addr = ((u64)be32_to_cpu(fh[6])) << 32;
                parent.no_addr |= be32_to_cpu(fh[7]);
-       case 4:
-               this.no_formal_ino = ((uint64_t)be32_to_cpu(fh[0])) << 32;
-               this.no_formal_ino |= be32_to_cpu(fh[1]);
-               this.no_addr = ((uint64_t)be32_to_cpu(fh[2])) << 32;
-               this.no_addr |= be32_to_cpu(fh[3]);
+               fh_obj.imode = be32_to_cpu(fh[8]);
+       case GFS2_SMALL_FH_SIZE:
+               this->no_formal_ino = ((u64)be32_to_cpu(fh[0])) << 32;
+               this->no_formal_ino |= be32_to_cpu(fh[1]);
+               this->no_addr = ((u64)be32_to_cpu(fh[2])) << 32;
+               this->no_addr |= be32_to_cpu(fh[3]);
                break;
        default:
                return NULL;
        }
 
-       return gfs2_export_ops.find_exported_dentry(sb, &this, &parent,
+       return gfs2_export_ops.find_exported_dentry(sb, &fh_obj, &parent,
                                                    acceptable, context);
 }
 
@@ -68,7 +72,8 @@ static int gfs2_encode_fh(struct dentry *dentry, __u32 *fh, int *len,
        struct super_block *sb = inode->i_sb;
        struct gfs2_inode *ip = GFS2_I(inode);
 
-       if (*len < 4 || (connectable && *len < 8))
+       if (*len < GFS2_SMALL_FH_SIZE ||
+           (connectable && *len < GFS2_LARGE_FH_SIZE))
                return 255;
 
        fh[0] = ip->i_num.no_formal_ino >> 32;
@@ -79,7 +84,7 @@ static int gfs2_encode_fh(struct dentry *dentry, __u32 *fh, int *len,
        fh[2] = cpu_to_be32(fh[2]);
        fh[3] = ip->i_num.no_addr & 0xFFFFFFFF;
        fh[3] = cpu_to_be32(fh[3]);
-       *len = 4;
+       *len = GFS2_SMALL_FH_SIZE;
 
        if (!connectable || inode == sb->s_root->d_inode)
                return *len;
@@ -98,7 +103,10 @@ static int gfs2_encode_fh(struct dentry *dentry, __u32 *fh, int *len,
        fh[6] = cpu_to_be32(fh[6]);
        fh[7] = ip->i_num.no_addr & 0xFFFFFFFF;
        fh[7] = cpu_to_be32(fh[7]);
-       *len = 8;
+
+       fh[8]  = cpu_to_be32(inode->i_mode);
+       fh[9]  = 0;     /* pad to double word */
+       *len = GFS2_LARGE_FH_SIZE;
 
        iput(inode);
 
@@ -111,7 +119,7 @@ struct get_name_filldir {
 };
 
 static int get_name_filldir(void *opaque, const char *name, unsigned int length,
-                           uint64_t offset, struct gfs2_inum *inum,
+                           u64 offset, struct gfs2_inum *inum,
                            unsigned int type)
 {
        struct get_name_filldir *gnfd = (struct get_name_filldir *)opaque;
@@ -133,7 +141,7 @@ static int gfs2_get_name(struct dentry *parent, char *name,
        struct gfs2_inode *dip, *ip;
        struct get_name_filldir gnfd;
        struct gfs2_holder gh;
-       uint64_t offset = 0;
+       u64 offset = 0;
        int error;
 
        if (!dir)
@@ -174,6 +182,10 @@ static struct dentry *gfs2_get_parent(struct dentry *child)
 
        if (!inode)
                return ERR_PTR(-ENOENT);
+       /*
+        * In case of an error, @inode carries the error value, and we
+        * have to return that as a(n invalid) pointer to dentry.
+        */
        if (IS_ERR(inode))
                return ERR_PTR(PTR_ERR(inode));
 
@@ -186,10 +198,11 @@ static struct dentry *gfs2_get_parent(struct dentry *child)
        return dentry;
 }
 
-static struct dentry *gfs2_get_dentry(struct super_block *sb, void *inum_p)
+static struct dentry *gfs2_get_dentry(struct super_block *sb, void *inum_obj)
 {
        struct gfs2_sbd *sdp = sb->s_fs_info;
-       struct gfs2_inum *inum = inum_p;
+       struct gfs2_fh_obj *fh_obj = (struct gfs2_fh_obj *)inum_obj;
+       struct gfs2_inum *inum = &fh_obj->this;
        struct gfs2_holder i_gh, ri_gh, rgd_gh;
        struct gfs2_rgrpd *rgd;
        struct inode *inode;
@@ -233,7 +246,7 @@ static struct dentry *gfs2_get_dentry(struct super_block *sb, void *inum_p)
        gfs2_glock_dq_uninit(&rgd_gh);
        gfs2_glock_dq_uninit(&ri_gh);
 
-       inode = gfs2_inode_lookup(sb, inum, DT_UNKNOWN);
+       inode = gfs2_inode_lookup(sb, inum, fh_obj->imode);
        if (!inode)
                goto fail;
        if (IS_ERR(inode)) {