diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-04-24 14:01:02 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-04-24 14:01:02 -0400 |
| commit | 233607dbbc823caf685e778cabc49fb7f679900b (patch) | |
| tree | 13840137ee10788061cbec60fcfe8ea4c274558e /include/linux/nfs_xdr.h | |
| parent | 3dc5063786b273f1aee545844f6bd4e9651ebffe (diff) | |
| parent | b48633bd086d21f4a2a5bea96c7e6c7ba58eb60c (diff) | |
| download | kernel_samsung_smdk4412-233607dbbc823caf685e778cabc49fb7f679900b.zip kernel_samsung_smdk4412-233607dbbc823caf685e778cabc49fb7f679900b.tar.gz kernel_samsung_smdk4412-233607dbbc823caf685e778cabc49fb7f679900b.tar.bz2 | |
Merge branch 'devel'
Diffstat (limited to 'include/linux/nfs_xdr.h')
| -rw-r--r-- | include/linux/nfs_xdr.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index f301d0b..24263bb 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -140,6 +140,7 @@ struct nfs_openres { __u32 rflags; struct nfs_fattr * f_attr; struct nfs_fattr * dir_attr; + struct nfs_seqid * seqid; const struct nfs_server *server; int delegation_type; nfs4_stateid delegation; @@ -159,6 +160,7 @@ struct nfs_open_confirmargs { struct nfs_open_confirmres { nfs4_stateid stateid; + struct nfs_seqid * seqid; }; /* @@ -175,6 +177,7 @@ struct nfs_closeargs { struct nfs_closeres { nfs4_stateid stateid; struct nfs_fattr * fattr; + struct nfs_seqid * seqid; const struct nfs_server *server; }; /* @@ -199,7 +202,9 @@ struct nfs_lock_args { }; struct nfs_lock_res { - nfs4_stateid stateid; + nfs4_stateid stateid; + struct nfs_seqid * lock_seqid; + struct nfs_seqid * open_seqid; }; struct nfs_locku_args { @@ -210,7 +215,8 @@ struct nfs_locku_args { }; struct nfs_locku_res { - nfs4_stateid stateid; + nfs4_stateid stateid; + struct nfs_seqid * seqid; }; struct nfs_lockt_args { |