ceph_common.c (ee57741c5209154b8ef124bcaa2496da1b69a988) | ceph_common.c (cffaba15cd95d4a16eb5a6aa5c22a79f67d555ab) |
---|---|
1 2#include <linux/ceph/ceph_debug.h> 3#include <linux/backing-dev.h> 4#include <linux/ctype.h> 5#include <linux/fs.h> 6#include <linux/inet.h> 7#include <linux/in6.h> 8#include <linux/key.h> --- 187 unchanged lines hidden (view full) --- 196 /* int args above */ 197 Opt_fsid, 198 Opt_name, 199 Opt_secret, 200 Opt_key, 201 Opt_ip, 202 Opt_last_string, 203 /* string args above */ | 1 2#include <linux/ceph/ceph_debug.h> 3#include <linux/backing-dev.h> 4#include <linux/ctype.h> 5#include <linux/fs.h> 6#include <linux/inet.h> 7#include <linux/in6.h> 8#include <linux/key.h> --- 187 unchanged lines hidden (view full) --- 196 /* int args above */ 197 Opt_fsid, 198 Opt_name, 199 Opt_secret, 200 Opt_key, 201 Opt_ip, 202 Opt_last_string, 203 /* string args above */ |
204 Opt_share, |
|
204 Opt_noshare, | 205 Opt_noshare, |
206 Opt_crc, |
|
205 Opt_nocrc, 206}; 207 208static match_table_t opt_tokens = { 209 {Opt_osdtimeout, "osdtimeout=%d"}, 210 {Opt_osdkeepalivetimeout, "osdkeepalive=%d"}, 211 {Opt_mount_timeout, "mount_timeout=%d"}, 212 {Opt_osd_idle_ttl, "osd_idle_ttl=%d"}, 213 /* int args above */ 214 {Opt_fsid, "fsid=%s"}, 215 {Opt_name, "name=%s"}, 216 {Opt_secret, "secret=%s"}, 217 {Opt_key, "key=%s"}, 218 {Opt_ip, "ip=%s"}, 219 /* string args above */ | 207 Opt_nocrc, 208}; 209 210static match_table_t opt_tokens = { 211 {Opt_osdtimeout, "osdtimeout=%d"}, 212 {Opt_osdkeepalivetimeout, "osdkeepalive=%d"}, 213 {Opt_mount_timeout, "mount_timeout=%d"}, 214 {Opt_osd_idle_ttl, "osd_idle_ttl=%d"}, 215 /* int args above */ 216 {Opt_fsid, "fsid=%s"}, 217 {Opt_name, "name=%s"}, 218 {Opt_secret, "secret=%s"}, 219 {Opt_key, "key=%s"}, 220 {Opt_ip, "ip=%s"}, 221 /* string args above */ |
222 {Opt_share, "share"}, |
|
220 {Opt_noshare, "noshare"}, | 223 {Opt_noshare, "noshare"}, |
224 {Opt_crc, "crc"}, |
|
221 {Opt_nocrc, "nocrc"}, 222 {-1, NULL} 223}; 224 225void ceph_destroy_options(struct ceph_options *opt) 226{ 227 dout("destroy_options %p\n", opt); 228 kfree(opt->name); --- 165 unchanged lines hidden (view full) --- 394 break; 395 case Opt_osd_idle_ttl: 396 opt->osd_idle_ttl = intval; 397 break; 398 case Opt_mount_timeout: 399 opt->mount_timeout = intval; 400 break; 401 | 225 {Opt_nocrc, "nocrc"}, 226 {-1, NULL} 227}; 228 229void ceph_destroy_options(struct ceph_options *opt) 230{ 231 dout("destroy_options %p\n", opt); 232 kfree(opt->name); --- 165 unchanged lines hidden (view full) --- 398 break; 399 case Opt_osd_idle_ttl: 400 opt->osd_idle_ttl = intval; 401 break; 402 case Opt_mount_timeout: 403 opt->mount_timeout = intval; 404 break; 405 |
406 case Opt_share: 407 opt->flags &= ~CEPH_OPT_NOSHARE; 408 break; |
|
402 case Opt_noshare: 403 opt->flags |= CEPH_OPT_NOSHARE; 404 break; 405 | 409 case Opt_noshare: 410 opt->flags |= CEPH_OPT_NOSHARE; 411 break; 412 |
413 case Opt_crc: 414 opt->flags &= ~CEPH_OPT_NOCRC; 415 break; |
|
406 case Opt_nocrc: 407 opt->flags |= CEPH_OPT_NOCRC; 408 break; 409 410 default: 411 BUG_ON(token); 412 } 413 } --- 209 unchanged lines hidden --- | 416 case Opt_nocrc: 417 opt->flags |= CEPH_OPT_NOCRC; 418 break; 419 420 default: 421 BUG_ON(token); 422 } 423 } --- 209 unchanged lines hidden --- |