diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 18:01:42 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 18:01:42 +0200 |
| commit | 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c (patch) | |
| tree | c631dfe2854cb1382a5d8f5aa11b071762ddf27d /include/net/sctp/tsnmap.h | |
| parent | NFS: Create custom NFS v4 write_inode() function (diff) | |
| parent | VFS: Pass mount flags to sget() (diff) | |
| download | linux-8626e4a42675ff9903f7d4fbf14d8ebc11b5926c.tar.xz linux-8626e4a42675ff9903f7d4fbf14d8ebc11b5926c.zip | |
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6
Resolve conflicts with the VFS atomic open and sget changes.
Conflicts:
fs/nfs/nfs4proc.c
Diffstat (limited to 'include/net/sctp/tsnmap.h')
| -rw-r--r-- | include/net/sctp/tsnmap.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/sctp/tsnmap.h b/include/net/sctp/tsnmap.h index e7728bc14ccf..2c5d2b4d5d1e 100644 --- a/include/net/sctp/tsnmap.h +++ b/include/net/sctp/tsnmap.h @@ -117,7 +117,8 @@ void sctp_tsnmap_free(struct sctp_tsnmap *map); int sctp_tsnmap_check(const struct sctp_tsnmap *, __u32 tsn); /* Mark this TSN as seen. */ -int sctp_tsnmap_mark(struct sctp_tsnmap *, __u32 tsn); +int sctp_tsnmap_mark(struct sctp_tsnmap *, __u32 tsn, + struct sctp_transport *trans); /* Mark this TSN and all lower as seen. */ void sctp_tsnmap_skip(struct sctp_tsnmap *map, __u32 tsn); |