summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
26c1a57)
Introduce a couple of new constants which make the NFS filehandle
sizes that GFS2 uses a bit clearer. Also fix one or two minor
issues as per Jan Engelhardt's sixth email.
Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
memset(&parent, 0, sizeof(struct gfs2_inum));
switch (fh_type) {
memset(&parent, 0, sizeof(struct gfs2_inum));
switch (fh_type) {
+ 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 = ((u64)be32_to_cpu(fh[6])) << 32;
parent.no_addr |= be32_to_cpu(fh[7]);
fh_obj.imode = be32_to_cpu(fh[8]);
parent.no_formal_ino = ((u64)be32_to_cpu(fh[4])) << 32;
parent.no_formal_ino |= be32_to_cpu(fh[5]);
parent.no_addr = ((u64)be32_to_cpu(fh[6])) << 32;
parent.no_addr |= be32_to_cpu(fh[7]);
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_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;
struct super_block *sb = inode->i_sb;
struct gfs2_inode *ip = GFS2_I(inode);
struct super_block *sb = inode->i_sb;
struct gfs2_inode *ip = GFS2_I(inode);
- if (*len < 4 || (connectable && *len < 10))
+ if (*len < GFS2_SMALL_FH_SIZE ||
+ (connectable && *len < GFS2_LARGE_FH_SIZE))
return 255;
fh[0] = ip->i_num.no_formal_ino >> 32;
return 255;
fh[0] = ip->i_num.no_formal_ino >> 32;
fh[2] = cpu_to_be32(fh[2]);
fh[3] = ip->i_num.no_addr & 0xFFFFFFFF;
fh[3] = cpu_to_be32(fh[3]);
fh[2] = cpu_to_be32(fh[2]);
fh[3] = ip->i_num.no_addr & 0xFFFFFFFF;
fh[3] = cpu_to_be32(fh[3]);
+ *len = GFS2_SMALL_FH_SIZE;
if (!connectable || inode == sb->s_root->d_inode)
return *len;
if (!connectable || inode == sb->s_root->d_inode)
return *len;
fh[8] = cpu_to_be32(inode->i_mode);
fh[9] = 0; /* pad to double word */
fh[8] = cpu_to_be32(inode->i_mode);
fh[9] = 0; /* pad to double word */
+ *len = GFS2_LARGE_FH_SIZE;
#ifndef __OPS_EXPORT_DOT_H__
#define __OPS_EXPORT_DOT_H__
#ifndef __OPS_EXPORT_DOT_H__
#define __OPS_EXPORT_DOT_H__
+#define GFS2_SMALL_FH_SIZE 4
+#define GFS2_LARGE_FH_SIZE 10
+
extern struct export_operations gfs2_export_ops;
struct gfs2_fh_obj {
struct gfs2_inum this;
extern struct export_operations gfs2_export_ops;
struct gfs2_fh_obj {
struct gfs2_inum this;
return;
if (!strncmp(sb->s_type->name, "gfs2meta", 8))
return;
if (!strncmp(sb->s_type->name, "gfs2meta", 8))
- return; /* meta fs. don't do nothin' */
+ return; /* Nothing to do */
/* Unfreeze the filesystem, if we need to */
/* Unfreeze the filesystem, if we need to */
/* At this point, we're through participating in the lockspace */
gfs2_sys_fs_del(sdp);
vfree(sdp);
/* At this point, we're through participating in the lockspace */
gfs2_sys_fs_del(sdp);
vfree(sdp);
static void gfs2_write_super(struct super_block *sb)
{
static void gfs2_write_super(struct super_block *sb)
{
- struct gfs2_sbd *sdp = sb->s_fs_info;
- gfs2_log_flush(sdp, NULL);
+ gfs2_log_flush(sb->s_fs_info, NULL);