9p: Implement TLOCK
Subsystems (3)
PATCH 1/2 9p: Implement TLOCK
Synopsis
size[4] TLock tag[2] fid[4] flock[n]
size[4] RLock tag[2] status[1]Description
Tlock is used to acquire/release byte range posix locks on a file identified by given fid. The reply contains status of the lock request
flock structure:
type[1] - Type of lock: F_RDLCK, F_WRLCK, F_UNLCK flags[4] - Flags could be either of
P9_LOCK_FLAGS_BLOCK - Blocked lock request, if there is a
conflicting lock exists, wait for that lock to be released.
P9_LOCK_FLAGS_RECLAIM - Reclaim lock request, used when client is
trying to reclaim a lock after a server restrart (due to crash)
start[8] - Starting offset for lock
length[8] - Number of bytes to lock
If length is 0, lock all bytes starting at the location 'start' through to the end of file
pid[4] - PID of the process that wants to take lock client_id[4] - Unique client id
status[1] - Status of the lock request, can be
P9_LOCK_SUCCESS(0), P9_LOCK_BLOCKED(1), P9_LOCK_ERROR(2) or P9_LOCK_GRACE(3)
P9_LOCK_SUCCESS - Request was successful P9_LOCK_BLOCKED - A conflicting lock is held by another process P9_LOCK_ERROR - Error while processing the lock request P9_LOCK_GRACE - Server is in grace period, it can't accept new lock
requests in this period (except locks with P9_LOCK_FLAGS_RECLAIM flag set)
--- fs/9p/v9fs_vfs.h | 2 + fs/9p/vfs_file.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++- include/net/9p/9p.h | 28 ++++++++ include/net/9p/client.h | 1 + net/9p/client.c | 33 ++++++++++ 5 files changed, 222 insertions(+), 2 deletions(-)
fs/9p/v9fs_vfs.h +2 -0
@@ -64,3 +64,5 @@ int v9fs_uflags2omode(int uflags, int extended);ssize_t v9fs_file_readn (struct file *,char *,char __user *,u32 ,u64 );void v9fs_blank_wstat (struct p9_wstat *wstat); + +#define P9_LOCK_TIMEOUT (30*HZ)
fs/9p/vfs_file.c +158 -2
184 lines not on this page · raw message
include/net/9p/9p.h +28 -0
@@ -163,6 +163,8 @@ enum p9_msg_t {P9_RXATTRCREATE ,P9_TREADDIR =40 ,P9_RREADDIR , +P9_TLOCK =52 , +P9_RLOCK ,P9_TLINK =70 ,P9_RLINK , P9_TMKDIR = 72,
@@ -462,6 +464,32 @@ struct p9_iattr_dotl {u64 mtime_nsec; }; +#define P9_LOCK_SUCCESS 0 +#define P9_LOCK_BLOCKED 1 +#define P9_LOCK_ERROR 2 +#define P9_LOCK_GRACE 3 + +#define P9_LOCK_FLAGS_BLOCK 1 +#define P9_LOCK_FLAGS_RECLAIM 2 + +/* struct p9_flock: POSIX lock structure +* @type - type of lock +* @flags - lock flags +* @start - starting offset of the lock +* @length - number of bytes +* @proc_id - process id which wants to take lock +* @client_id - client id +*/ + +struct p9_flock { +u8 type; +u32 flags; +u64 start; +u64 length; +u32 proc_id; +char *client_id; +}; +/* Structures for Protocol Operations */ struct p9_tstatfs {u32 fid;
include/net/9p/client.h +1 -0
@@ -251,6 +251,7 @@ int p9_client_mknod_dotl(struct p9_fid *oldfid, char *name, int mode, dev_t rdev, gid_t gid, struct p9_qid *);int p9_client_mkdir_dotl (struct p9_fid *fid,char *name,int mode,gid_t gid,struct p9_qid *); +int p9_client_lock_dotl (struct p9_fid *fid,struct p9_flock *flock,u8 *status);struct p9_req_t *p9_tag_lookup (struct p9_client *,u16 );void p9_client_cb (struct p9_client *c,struct p9_req_t *req);
net/9p/client.c +33 -0
@@ -1827,3 +1827,36 @@ error: }EXPORT_SYMBOL (p9_client_mkdir_dotl); + +int p9_client_lock_dotl (struct p9_fid *fid,struct p9_flock *flock,u8 *status) +{ +int err; +struct p9_client *clnt; +struct p9_req_t *req; + + err =0 ; + clnt = fid->clnt; +P9_DPRINTK (P9_DEBUG_9P ,">>> TLOCK fid %d type %i flags %d " +"start %lld length %lld proc_id %d client_id %s\n" , + fid->fid, flock->type, flock->flags, flock->start, + flock->length, flock->proc_id, flock->client_id); + + req =p9_client_rpc (clnt,P9_TLOCK ,"dbdqqds" , fid->fid, flock->type, + flock->flags, flock->start, flock->length, + flock->proc_id, flock->client_id); + +if (IS_ERR (req)) +return PTR_ERR (req); + + err =p9pdu_readf (req->rc, clnt->proto_version,"b" , status); +if (err) { +p9pdu_dump (1 , req->rc); + goto error; + } +P9_DPRINTK (P9_DEBUG_9P ,"<<< RLOCK status %i\n" , *status); +error: +p9_free_req (clnt, req); +return err; + +} +EXPORT_SYMBOL (p9_client_lock_dotl);
Signature · 1 line
1.7.0.4
PATCH 2/2 9p: Implement TGETLOCK
Synopsis
size[4] TGetlock tag[2] fid[4] getlock[n]
size[4] RGetlock tag[2] getlock[n]
Description
TGetlock is used to test for the existence of byte range posix locks on a file identified by given fid. The reply contains getlock structure. If the lock could be placed it returns F_UNLCK in type field of getlock structure. Otherwise it returns the details of the conflicting locks in the getlock structure
getlock structure:
type[1] - Type of lock: F_RDLCK, F_WRLCK
start[8] - Starting offset for lock
length[8] - Number of bytes to lock
pid[4] - PID of the process that wants to take lock/owns the task
in case of reply
client[4] - Client id of the system that owns the process which
has the conflicting lock
--- fs/9p/vfs_file.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ include/net/9p/9p.h | 18 ++++++++++++++++++ include/net/9p/client.h | 1 + net/9p/client.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 0 deletions(-)
fs/9p/vfs_file.c +47 -0
@@ -208,6 +208,51 @@ out:return res; } +static int v9fs_file_getlock (struct file *filp,struct file_lock *fl) +{ +struct p9_getlock glock; +struct p9_fid *fid; +int res =0 ; + + fid = filp->private_data; +BUG_ON (fid ==NULL ); + +posix_test_lock (filp, fl); +/* +* if we have a conflicting lock locally, no need to validate +* with server +*/ +if (fl->fl_type !=F_UNLCK ) +return res; + +/* convert posix lock to p9 tgetlock args */ +memset (&glock,0 ,sizeof (glock)); + glock.type = fl->fl_type; + glock.start = fl->fl_start; +if (fl->fl_end ==OFFSET_MAX ) + glock.length =0 ; +else + glock.length = fl->fl_end - fl->fl_start +1 ; + glock.proc_id = fl->fl_pid; + glock.client_id =utsname ()->nodename; + + res =p9_client_getlock_dotl (fid, &glock); +if (res <0 ) +return res; +if (glock.type !=F_UNLCK ) { + fl->fl_type = glock.type; + fl->fl_start = glock.start; +if (glock.length ==0 ) + fl->fl_end =OFFSET_MAX ; +else + fl->fl_end = glock.start + glock.length -1 ; + fl->fl_pid = glock.proc_id; + }else + fl->fl_type =F_UNLCK ; + +return res; +} +/** * v9fs_file_lock_dotl - lock a file (or directory) * @filp: file to be locked
@@ -235,6 +280,8 @@ static int v9fs_file_lock_dotl(struct file *filp, int cmd, struct file_lock *fl)if (IS_SETLK (cmd) ||IS_SETLKW (cmd)) ret =v9fs_file_do_lock (filp, cmd, fl); +else if (IS_GETLK (cmd)) + ret =v9fs_file_getlock (filp, fl);else ret = -EINVAL ; out_err:
include/net/9p/9p.h +18 -0
@@ -165,6 +165,8 @@ enum p9_msg_t {P9_RREADDIR ,P9_TLOCK =52 ,P9_RLOCK , +P9_TGETLOCK =54 , +P9_RGETLOCK ,P9_TLINK =70 ,P9_RLINK , P9_TMKDIR = 72,
@@ -490,6 +492,22 @@ struct p9_flock {char *client_id; }; +/* struct p9_getlock: getlock structure +* @type - type of lock +* @start - starting offset of the lock +* @length - number of bytes +* @proc_id - process id which wants to take lock +* @client_id - client id +*/ + +struct p9_getlock { +u8 type; +u64 start; +u64 length; +u32 proc_id; +char *client_id; +}; +/* Structures for Protocol Operations */ struct p9_tstatfs {u32 fid;
include/net/9p/client.h +1 -0
@@ -252,6 +252,7 @@ int p9_client_mknod_dotl(struct p9_fid *oldfid, char *name, int mode,int p9_client_mkdir_dotl (struct p9_fid *fid,char *name,int mode,gid_t gid,struct p9_qid *);int p9_client_lock_dotl (struct p9_fid *fid,struct p9_flock *flock,u8 *status); +int p9_client_getlock_dotl (struct p9_fid *fid,struct p9_getlock *fl);struct p9_req_t *p9_tag_lookup (struct p9_client *,u16 );void p9_client_cb (struct p9_client *c,struct p9_req_t *req);
net/9p/client.c +34 -0
@@ -1860,3 +1860,37 @@ error: }EXPORT_SYMBOL (p9_client_lock_dotl); + +int p9_client_getlock_dotl (struct p9_fid *fid,struct p9_getlock *glock) +{ +int err; +struct p9_client *clnt; +struct p9_req_t *req; + + err =0 ; + clnt = fid->clnt; +P9_DPRINTK (P9_DEBUG_9P ,">>> TGETLOCK fid %d, type %i start %lld " +"length %lld proc_id %d client_id %s\n" , fid->fid, glock->type, + glock->start, glock->length, glock->proc_id, glock->client_id); + + req =p9_client_rpc (clnt,P9_TGETLOCK ,"dbqqds" , fid->fid, glock->type, + glock->start, glock->length, glock->proc_id, glock->client_id); + +if (IS_ERR (req)) +return PTR_ERR (req); + + err =p9pdu_readf (req->rc, clnt->proto_version,"bqqds" , &glock->type, + &glock->start, &glock->length, &glock->proc_id, + &glock->client_id); +if (err) { +p9pdu_dump (1 , req->rc); + goto error; + } +P9_DPRINTK (P9_DEBUG_9P ,"<<< RGETLOCK type %i start %lld length %lld " +"proc_id %d client_id %s\n" , glock->type, glock->start, + glock->length, glock->proc_id, glock->client_id); +error: +p9_free_req (clnt, req); +return err; +} +EXPORT_SYMBOL (p9_client_getlock_dotl);
Signature · 1 line
1.7.0.4