diff options
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/cluster/tcp.c | 4 | ||||
-rw-r--r-- | fs/ocfs2/dlmglue.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/extent_map.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index d8d0c65ac03..73e743eea2c 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c | |||
@@ -72,9 +72,9 @@ | |||
72 | 72 | ||
73 | #include "tcp_internal.h" | 73 | #include "tcp_internal.h" |
74 | 74 | ||
75 | #define SC_NODEF_FMT "node %s (num %u) at %u.%u.%u.%u:%u" | 75 | #define SC_NODEF_FMT "node %s (num %u) at %pI4:%u" |
76 | #define SC_NODEF_ARGS(sc) sc->sc_node->nd_name, sc->sc_node->nd_num, \ | 76 | #define SC_NODEF_ARGS(sc) sc->sc_node->nd_name, sc->sc_node->nd_num, \ |
77 | NIPQUAD(sc->sc_node->nd_ipv4_address), \ | 77 | &sc->sc_node->nd_ipv4_address, \ |
78 | ntohs(sc->sc_node->nd_ipv4_port) | 78 | ntohs(sc->sc_node->nd_ipv4_port) |
79 | 79 | ||
80 | /* | 80 | /* |
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 8298608d416..50c4ee805da 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c | |||
@@ -1881,7 +1881,7 @@ out: | |||
1881 | * ocfs2_file_lock() and ocfs2_file_unlock() map to a single pair of | 1881 | * ocfs2_file_lock() and ocfs2_file_unlock() map to a single pair of |
1882 | * flock() calls. The locking approach this requires is sufficiently | 1882 | * flock() calls. The locking approach this requires is sufficiently |
1883 | * different from all other cluster lock types that we implement a | 1883 | * different from all other cluster lock types that we implement a |
1884 | * seperate path to the "low-level" dlm calls. In particular: | 1884 | * separate path to the "low-level" dlm calls. In particular: |
1885 | * | 1885 | * |
1886 | * - No optimization of lock levels is done - we take at exactly | 1886 | * - No optimization of lock levels is done - we take at exactly |
1887 | * what's been requested. | 1887 | * what's been requested. |
diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c index 5328529e7fd..c562a7581cf 100644 --- a/fs/ocfs2/extent_map.c +++ b/fs/ocfs2/extent_map.c | |||
@@ -453,7 +453,7 @@ static int ocfs2_get_clusters_nocache(struct inode *inode, | |||
453 | if (i == -1) { | 453 | if (i == -1) { |
454 | /* | 454 | /* |
455 | * Holes can be larger than the maximum size of an | 455 | * Holes can be larger than the maximum size of an |
456 | * extent, so we return their lengths in a seperate | 456 | * extent, so we return their lengths in a separate |
457 | * field. | 457 | * field. |
458 | */ | 458 | */ |
459 | if (hole_len) { | 459 | if (hole_len) { |