← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to fs/nfs/direct.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/nfs/direct.c
53
53
 
54
54
#include <asm/system.h>
55
55
#include <asm/uaccess.h>
56
 
#include <asm/atomic.h>
 
56
#include <linux/atomic.h>
57
57
 
58
58
#include "internal.h"
59
59
#include "iostat.h"
284
284
                                                loff_t pos)
285
285
{
286
286
        struct nfs_open_context *ctx = dreq->ctx;
287
 
        struct inode *inode = ctx->path.dentry->d_inode;
 
287
        struct inode *inode = ctx->dentry->d_inode;
288
288
        unsigned long user_addr = (unsigned long)iov->iov_base;
289
289
        size_t count = iov->iov_len;
290
290
        size_t rsize = NFS_SERVER(inode)->rsize;
715
715
                                                 loff_t pos, int sync)
716
716
{
717
717
        struct nfs_open_context *ctx = dreq->ctx;
718
 
        struct inode *inode = ctx->path.dentry->d_inode;
 
718
        struct inode *inode = ctx->dentry->d_inode;
719
719
        unsigned long user_addr = (unsigned long)iov->iov_base;
720
720
        size_t count = iov->iov_len;
721
721
        struct rpc_task *task;