Trond Myklebust wrote:
> On Mon, 2009-04-20 at 11:09 +0530, Suresh Jayaraman wrote:
>> Hi Trond,
>>
>> Do you think this patch is OK? Can this be considered for merging?
>>
>> Thanks,
>>
>>>>>> diff --git a/fs/nfs/file.c b/fs/nfs/file.c
>>>>>> index 90f292b..13d6a00 100644
>>>>>> --- a/fs/nfs/file.c
>>>>>> +++ b/fs/nfs/file.c
>>>>>> @@ -47,6 +47,9 @@ static ssize_t nfs_file_splice_read(struct file *filp, loff_t *ppos,
>>>>>> size_t count, unsigned int flags);
>>>>>> static ssize_t nfs_file_read(struct kiocb *, const struct iovec *iov,
>>>>>> unsigned long nr_segs, loff_t pos);
>>>>>> +static ssize_t nfs_file_splice_write(struct pipe_inode_info *pipe,
>>>>>> + struct file *filp, loff_t *ppos,
>>>>>> + size_t count, unsigned int flags);
>>>>>> static ssize_t nfs_file_write(struct kiocb *, const struct iovec *iov,
>>>>>> unsigned long nr_segs, loff_t pos);
>>>>>> static int nfs_file_flush(struct file *, fl_owner_t id);
>>>>>> @@ -76,6 +79,7 @@ const struct file_operations nfs_file_operations = {
>>>>>> .lock = nfs_lock,
>>>>>> .flock = nfs_flock,
>>>>>> .splice_read = nfs_file_splice_read,
>>>>>> + .splice_write = nfs_file_splice_write,
>>>>>> .check_flags = nfs_check_flags,
>>>>>> .setlease = nfs_setlease,
>>>>>> };
>>>>>> @@ -550,6 +554,26 @@ out_swapfile:
>>>>>> goto out;
>>>>>> }
>>>>>>
>>>>>> +static ssize_t nfs_file_splice_write(struct pipe_inode_info *pipe,
>>>>>> + struct file *filp, loff_t *ppos,
>>>>>> + size_t count, unsigned int flags)
>>>>>> +{
>>>>>> + struct dentry *dentry = filp->f_path.dentry;
>>>>>> + struct inode *inode = dentry->d_inode;
>>>>>> +
>>>>>> + dprintk("NFS splice_write(%s/%s, %lu@%Lu)\n",
>>>>>> + dentry->d_parent->d_name.name, dentry->d_name.name,
>>>>>> + (unsigned long) count, (unsigned long long) *ppos);
>>>>>> +
>>>>>> + if (IS_SWAPFILE(inode)) {
>>>>>> + printk(KERN_INFO "NFS: attempt to write to active swap"
>>>>>> + "file!\n");
>>>>>> + return -EBUSY;
>>>>>> + }
>
> I don't know that we really need this. We should sweep through the NFS
> code and kill all those IS_SWAPFILE() thingys. Or at least #define
> IS_SWAPFILE(a) (0)
> ...
Hmm.. I'm not sure whether we should kill them now. I think originally,
these were added keeping in mind the future NFS swap support. Given that
the recent work from Peterz Zilstra on "Swap over NFS" and multiple
iterations/review on the same, I think those patches will eventually get
merged sooner or later. Perhaps, it's a good idea to #define
IS_SWAPFILE(a) 0 than killing them entirely..?
Thanks,
>>>>>> +
>>>>>> + return generic_file_splice_write(pipe, filp, ppos, count, flags);
>>>>>> +}
>>>>>> +
>>>>>> static int do_getlk(struct file *filp, int cmd, struct file_lock *fl)
>>>>>> {
>>>>>> struct inode *inode = filp->f_mapping->host;
>>>>>>
>
> Otherwise it looks fine...
>
>
>
--
Suresh Jayaraman
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
