On Wed, Aug 30, 2017 at 03:50:59PM -0400, Jeff Layton wrote: > ACK, I like that better too. I think a kerneldoc header is probably > warranted here too, since this is a bit of an odd return situation. Am I overdoing it?: --b. diff --git a/include/linux/fs.h b/include/linux/fs.h index 6421feeda4bd..2261728cc900 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2285,6 +2285,25 @@ static inline int break_deleg(struct inode *inode, void *who, unsigned int mode) #define DELEG_NO_WAIT ((struct inode *)1) +/** + * try_break_deleg - initiate a delegation break + * @inode: inode to break the delegation on + * @deleg_break_ctl: delegation state; see below + * + * VFS operations that are incompatible with a delegation call this to + * break any delegations on the inode first. The caller must first lock + * the inode to prevent races with processes granting new delegations. + * + * Delegations may be slow to recall, so we initiate the recall but do + * not wait for it here while holding locks. The caller should instead + * drop locks and call break_deleg_wait() which will wait for a recall, + * if there is one. The inode to wait on will be stored in + * deleg_break_ctl, which also tracks who is breaking the delegation in + * the NFS case. The caller can then retry the operation (possibly on a + * different inode, since a new lookup may have been required after + * reacquiring locks.) + */ + static inline int try_break_deleg(struct inode *inode, struct deleg_break_ctl *deleg_break_ctl) { int ret; @@ -2299,6 +2318,22 @@ static inline int try_break_deleg(struct inode *inode, struct deleg_break_ctl *d return ret; } +/** + * break_deleg_wait - wait on a delegation recall if necessary + * @deleg_break_ctl: delegation state + * @error: error to use if there is no delegation to wait on + * + * This should be called with the deleg_break_ctl previously passed to + * try_break_deleg(). + * + * If the previous try_break_deleg() found no delegation in need of + * breaking, this is a no-op that just returns the given error. + * + * Otherwise it will wait for the delegation recall. If the wait is + * succesful, it will return a positive value to indicate to the caller + * that it should retry the operation that originally prompted the + * break. + */ static inline int break_deleg_wait(struct deleg_break_ctl *deleg_break_ctl, int error) { if (!deleg_break_ctl->delegated_inode)