diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 16:26:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 16:26:10 -0700 |
| commit | ab70a1d7c7fc6665d83f41b5ce790ff8376e0b81 (patch) | |
| tree | dee8acafa2dfb87cde4ddba68eff5e1c75557469 /fs/9p/acl.c | |
| parent | 0adfc56ce8fdc5c17630434e49f30536ba7b8559 (diff) | |
| parent | 68da9ba4eeadae86ad42e52b80822fbd56971267 (diff) | |
| download | op-kernel-dev-ab70a1d7c7fc6665d83f41b5ce790ff8376e0b81.zip op-kernel-dev-ab70a1d7c7fc6665d83f41b5ce790ff8376e0b81.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
[net/9p]: Introduce basic flow-control for VirtIO transport.
9p: use the updated offset given by generic_write_checks
[net/9p] Don't re-pin pages on retrying virtqueue_add_buf().
[net/9p] Set the condition just before waking up.
[net/9p] unconditional wake_up to proc waiting for space on VirtIO ring
fs/9p: Add v9fs_dentry2v9ses
fs/9p: Attach writeback_fid on first open with WR flag
fs/9p: Open writeback fid in O_SYNC mode
fs/9p: Use truncate_setsize instead of vmtruncate
net/9p: Fix compile warning
net/9p: Convert the in the 9p rpc call path to GFP_NOFS
fs/9p: Fix race in initializing writeback fid
Diffstat (limited to 'fs/9p/acl.c')
| -rw-r--r-- | fs/9p/acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/9p/acl.c b/fs/9p/acl.c index 5154552..33aa1167 100644 --- a/fs/9p/acl.c +++ b/fs/9p/acl.c @@ -262,7 +262,7 @@ static int v9fs_xattr_get_acl(struct dentry *dentry, const char *name, if (strcmp(name, "") != 0) return -EINVAL; - v9ses = v9fs_inode2v9ses(dentry->d_inode); + v9ses = v9fs_dentry2v9ses(dentry); /* * We allow set/get/list of acl when access=client is not specified */ @@ -312,7 +312,7 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name, if (strcmp(name, "") != 0) return -EINVAL; - v9ses = v9fs_inode2v9ses(dentry->d_inode); + v9ses = v9fs_dentry2v9ses(dentry); /* * set the attribute on the remote. Without even looking at the * xattr value. We leave it to the server to validate |
