tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

libceph: drop started parameter of __ceph_open_session()

With the previous commit revamping the timeout handling, started isn't
used anymore. It could be taken into account by adjusting the initial
value of the timeout, but there is little point as both callers capture
the timestamp shortly before calling __ceph_open_session() -- the only
thing of note that happens in the interim is taking client->mount_mutex
and that isn't expected to take multiple seconds.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com>

Ilya Dryomov 85f5491d 076381c2

+4 -6
+1 -1
fs/ceph/super.c
··· 1149 1149 const char *path = fsc->mount_options->server_path ? 1150 1150 fsc->mount_options->server_path + 1 : ""; 1151 1151 1152 - err = __ceph_open_session(fsc->client, started); 1152 + err = __ceph_open_session(fsc->client); 1153 1153 if (err < 0) 1154 1154 goto out; 1155 1155
+1 -2
include/linux/ceph/libceph.h
··· 306 306 u64 ceph_client_gid(struct ceph_client *client); 307 307 extern void ceph_destroy_client(struct ceph_client *client); 308 308 extern void ceph_reset_client_addr(struct ceph_client *client); 309 - extern int __ceph_open_session(struct ceph_client *client, 310 - unsigned long started); 309 + extern int __ceph_open_session(struct ceph_client *client); 311 310 extern int ceph_open_session(struct ceph_client *client); 312 311 int ceph_wait_for_latest_osdmap(struct ceph_client *client, 313 312 unsigned long timeout);
+2 -3
net/ceph/ceph_common.c
··· 788 788 /* 789 789 * mount: join the ceph cluster, and open root directory. 790 790 */ 791 - int __ceph_open_session(struct ceph_client *client, unsigned long started) 791 + int __ceph_open_session(struct ceph_client *client) 792 792 { 793 793 DEFINE_WAIT_FUNC(wait, woken_wake_function); 794 794 long timeout = ceph_timeout_jiffies(client->options->mount_timeout); ··· 844 844 int ceph_open_session(struct ceph_client *client) 845 845 { 846 846 int ret; 847 - unsigned long started = jiffies; /* note the start time */ 848 847 849 848 dout("open_session start\n"); 850 849 mutex_lock(&client->mount_mutex); 851 850 852 - ret = __ceph_open_session(client, started); 851 + ret = __ceph_open_session(client); 853 852 854 853 mutex_unlock(&client->mount_mutex); 855 854 return ret;