From: "J. Bruce Fields" <bfields@fieldses.org>
To: Christoph Hellwig <hch@lst.de>
Cc: akpm@osdl.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH] rename setleast to generic_setlease
Date: Fri, 20 Jul 2007 17:36:48 -0400 [thread overview]
Message-ID: <20070720213648.GN6514@fieldses.org> (raw)
In-Reply-To: <20070720092823.GA3767@lst.de>
On Fri, Jul 20, 2007 at 11:28:23AM +0200, Christoph Hellwig wrote:
> Make it a little more clear that this is the default implemenation for
> the setleast operation.
Yeah, I guess that is more consistent with the rest of the vfs.
Thanks.--b.
>
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> Index: linux-2.6/fs/gfs2/ops_file.c
> ===================================================================
> --- linux-2.6.orig/fs/gfs2/ops_file.c 2007-07-19 21:54:53.000000000 +0200
> +++ linux-2.6/fs/gfs2/ops_file.c 2007-07-19 22:10:33.000000000 +0200
> @@ -508,7 +508,7 @@ static int gfs2_setlease(struct file *fi
> */
> if (!sdp->sd_args.ar_localflocks)
> return -EINVAL;
> - return setlease(file, arg, fl);
> + return generic_setlease(file, arg, fl);
> }
>
> /**
> Index: linux-2.6/fs/locks.c
> ===================================================================
> --- linux-2.6.orig/fs/locks.c 2007-07-19 21:54:54.000000000 +0200
> +++ linux-2.6/fs/locks.c 2007-07-19 22:15:13.000000000 +0200
> @@ -1324,7 +1324,7 @@ int fcntl_getlease(struct file *filp)
> }
>
> /**
> - * setlease - sets a lease on an open file
> + * generic_setlease - sets a lease on an open file
> * @filp: file pointer
> * @arg: type of lease to obtain
> * @flp: input - file_lock to use, output - file_lock inserted
> @@ -1334,7 +1334,7 @@ int fcntl_getlease(struct file *filp)
> *
> * Called with kernel lock held.
> */
> -int setlease(struct file *filp, long arg, struct file_lock **flp)
> +int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
> {
> struct file_lock *fl, **before, **my_before = NULL, *lease;
> struct dentry *dentry = filp->f_path.dentry;
> @@ -1419,7 +1419,7 @@ int setlease(struct file *filp, long arg
> out:
> return error;
> }
> -EXPORT_SYMBOL(setlease);
> +EXPORT_SYMBOL(generic_setlease);
>
> /**
> * vfs_setlease - sets a lease on an open file
> @@ -1456,7 +1456,7 @@ int vfs_setlease(struct file *filp, long
> if (filp->f_op && filp->f_op->setlease)
> error = filp->f_op->setlease(filp, arg, lease);
> else
> - error = setlease(filp, arg, lease);
> + error = generic_setlease(filp, arg, lease);
> unlock_kernel();
>
> return error;
> Index: linux-2.6/include/linux/fs.h
> ===================================================================
> --- linux-2.6.orig/include/linux/fs.h 2007-07-19 21:54:53.000000000 +0200
> +++ linux-2.6/include/linux/fs.h 2007-07-19 22:10:33.000000000 +0200
> @@ -878,7 +878,7 @@ extern int vfs_cancel_lock(struct file *
> extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl);
> extern int __break_lease(struct inode *inode, unsigned int flags);
> extern void lease_get_mtime(struct inode *, struct timespec *time);
> -extern int setlease(struct file *, long, struct file_lock **);
> +extern int generic_setlease(struct file *, long, struct file_lock **);
> extern int vfs_setlease(struct file *, long, struct file_lock **);
> extern int lease_modify(struct file_lock **, int);
> extern int lock_may_read(struct inode *, loff_t start, unsigned long count);
prev parent reply other threads:[~2007-07-20 21:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-20 9:28 [PATCH] rename setleast to generic_setlease Christoph Hellwig
2007-07-20 21:36 ` J. Bruce Fields [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070720213648.GN6514@fieldses.org \
--to=bfields@fieldses.org \
--cc=akpm@osdl.org \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.