diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 /fs/ceph/auth.c | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) | |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'fs/ceph/auth.c')
| -rw-r--r-- | fs/ceph/auth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ceph/auth.c b/fs/ceph/auth.c index 89490beaf537..6d2e30600627 100644 --- a/fs/ceph/auth.c +++ b/fs/ceph/auth.c | |||
| @@ -20,7 +20,7 @@ static u32 supported_protocols[] = { | |||
| 20 | CEPH_AUTH_CEPHX | 20 | CEPH_AUTH_CEPHX |
| 21 | }; | 21 | }; |
| 22 | 22 | ||
| 23 | int ceph_auth_init_protocol(struct ceph_auth_client *ac, int protocol) | 23 | static int ceph_auth_init_protocol(struct ceph_auth_client *ac, int protocol) |
| 24 | { | 24 | { |
| 25 | switch (protocol) { | 25 | switch (protocol) { |
| 26 | case CEPH_AUTH_NONE: | 26 | case CEPH_AUTH_NONE: |
| @@ -133,8 +133,8 @@ bad: | |||
| 133 | return -ERANGE; | 133 | return -ERANGE; |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | int ceph_build_auth_request(struct ceph_auth_client *ac, | 136 | static int ceph_build_auth_request(struct ceph_auth_client *ac, |
| 137 | void *msg_buf, size_t msg_len) | 137 | void *msg_buf, size_t msg_len) |
| 138 | { | 138 | { |
| 139 | struct ceph_mon_request_header *monhdr = msg_buf; | 139 | struct ceph_mon_request_header *monhdr = msg_buf; |
| 140 | void *p = monhdr + 1; | 140 | void *p = monhdr + 1; |