Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 367c8c7b authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

lockd: Pass "struct sockaddr *" to new failover-by-IP function 



Pass a more generic socket address type to nlmsvc_unlock_all_by_ip() to
allow for future support of IPv6.  Also provide additional sanity
checking in failover_unlock_ip() when constructing the server's IP
address.

As an added bonus, provide clean kerneldoc comments on related NLM
interfaces which were recently added.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 560de0e6

fs/lockd/svcsubs.c

+23 −9
Original line number Original line Diff line number Diff line
@@ -373,13 +373,16 @@ nlmsvc_free_host_resources(struct nlm_host *host) 
	}

	}

}

}





/*

/**

 * Remove all locks held for clients

 * nlmsvc_invalidate_all - remove all locks held for clients

 *

 * Release all locks held by NFS clients.

 *

 */

 */

void

void

nlmsvc_invalidate_all(void)

nlmsvc_invalidate_all(void)

{

{

	/* Release all locks held by NFS clients.

	/*

	 * Previously, the code would call

	 * Previously, the code would call

	 * nlmsvc_free_host_resources for each client in

	 * nlmsvc_free_host_resources for each client in

	 * turn, which is about as inefficient as it gets.

	 * turn, which is about as inefficient as it gets.
@@ -396,6 +399,12 @@ nlmsvc_match_sb(void *datap, struct nlm_file *file) 
	return sb == file->f_file->f_path.mnt->mnt_sb;

	return sb == file->f_file->f_path.mnt->mnt_sb;

}

}





/**

 * nlmsvc_unlock_all_by_sb - release locks held on this file system

 * @sb: super block

 *

 * Release all locks held by clients accessing this file system.

 */

int

int

nlmsvc_unlock_all_by_sb(struct super_block *sb)

nlmsvc_unlock_all_by_sb(struct super_block *sb)

{

{
@@ -409,17 +418,22 @@ EXPORT_SYMBOL_GPL(nlmsvc_unlock_all_by_sb); 
static int

static int

nlmsvc_match_ip(void *datap, struct nlm_host *host)

nlmsvc_match_ip(void *datap, struct nlm_host *host)

{

{

	__be32 *server_addr = datap;

	return nlm_cmp_addr(&host->h_saddr, datap);



	return host->h_saddr.sin_addr.s_addr == *server_addr;

}

}





/**

 * nlmsvc_unlock_all_by_ip - release local locks by IP address

 * @server_addr: server's IP address as seen by clients

 *

 * Release all locks held by clients accessing this host

 * via the passed in IP address.

 */

int

int

nlmsvc_unlock_all_by_ip(__be32 server_addr)

nlmsvc_unlock_all_by_ip(struct sockaddr *server_addr)

{

{

	int ret;

	int ret;

	ret = nlm_traverse_files(&server_addr, nlmsvc_match_ip, NULL);

	return ret ? -EIO : 0;





	ret = nlm_traverse_files(server_addr, nlmsvc_match_ip, NULL);

	return ret ? -EIO : 0;

}

}

EXPORT_SYMBOL_GPL(nlmsvc_unlock_all_by_ip);
 
EXPORT_SYMBOL_GPL(nlmsvc_unlock_all_by_ip);

fs/nfsd/nfsctl.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -310,9 +310,12 @@ static ssize_t write_getfd(struct file *file, char *buf, size_t size) 




static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size)

static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size)

{

{

	__be32 server_ip;

	struct sockaddr_in sin = {

	char *fo_path, c;

		.sin_family	= AF_INET,

	};

	int b1, b2, b3, b4;

	int b1, b2, b3, b4;

	char c;

	char *fo_path;





	/* sanity check */

	/* sanity check */

	if (size == 0)

	if (size == 0)
@@ -326,11 +329,13 @@ static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size) 
		return -EINVAL;

		return -EINVAL;





	/* get ipv4 address */

	/* get ipv4 address */

	if (sscanf(fo_path, "%u.%u.%u.%u%c", &b1, &b2, &b3, &b4, &c) != 4)

	if (sscanf(fo_path, NIPQUAD_FMT "%c", &b1, &b2, &b3, &b4, &c) != 4)

		return -EINVAL;

	if (b1 > 255 || b2 > 255 || b3 > 255 || b4 > 255)

		return -EINVAL;

		return -EINVAL;

	server_ip = htonl((((((b1<<8)|b2)<<8)|b3)<<8)|b4);

	sin.sin_addr.s_addr = htonl((b1 << 24) | (b2 << 16) | (b3 << 8) | b4);





	return nlmsvc_unlock_all_by_ip(server_ip);

	return nlmsvc_unlock_all_by_ip((struct sockaddr *)&sin);

}

}





static ssize_t failover_unlock_fs(struct file *file, char *buf, size_t size)

static ssize_t failover_unlock_fs(struct file *file, char *buf, size_t size)

include/linux/lockd/lockd.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -226,7 +226,7 @@ void nlmsvc_invalidate_all(void); 
 * Cluster failover support

 * Cluster failover support

 */

 */

int           nlmsvc_unlock_all_by_sb(struct super_block *sb);

int           nlmsvc_unlock_all_by_sb(struct super_block *sb);

int           nlmsvc_unlock_all_by_ip(__be32 server_addr);

int           nlmsvc_unlock_all_by_ip(struct sockaddr *server_addr);





static inline struct inode *nlmsvc_file_inode(struct nlm_file *file)

static inline struct inode *nlmsvc_file_inode(struct nlm_file *file)

{

{