diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 14:26:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 14:26:52 -0400 |
| commit | 5f248c9c251c60af3403902b26e08de43964ea0b (patch) | |
| tree | 6d3328e72a7e4015a64017eb30be18095c6a3c64 /fs/fuse/dir.c | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
| parent | dca332528bc69e05f67161e1ed59929633d5e63d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (96 commits)
no need for list_for_each_entry_safe()/resetting with superblock list
Fix sget() race with failing mount
vfs: don't hold s_umount over close_bdev_exclusive() call
sysv: do not mark superblock dirty on remount
sysv: do not mark superblock dirty on mount
btrfs: remove junk sb_dirt change
BFS: clean up the superblock usage
AFFS: wait for sb synchronization when needed
AFFS: clean up dirty flag usage
cifs: truncate fallout
mbcache: fix shrinker function return value
mbcache: Remove unused features
add f_flags to struct statfs(64)
pass a struct path to vfs_statfs
update VFS documentation for method changes.
All filesystems that need invalidate_inode_buffers() are doing that explicitly
convert remaining ->clear_inode() to ->evict_inode()
Make ->drop_inode() just return whether inode needs to be dropped
fs/inode.c:clear_inode() is gone
fs/inode.c:evict() doesn't care about delete vs. non-delete paths now
...
Fix up trivial conflicts in fs/nilfs2/super.c
Diffstat (limited to 'fs/fuse/dir.c')
| -rw-r--r-- | fs/fuse/dir.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 431be0795b6b..c9627c95482d 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c | |||
| @@ -1270,21 +1270,18 @@ static int fuse_do_setattr(struct dentry *entry, struct iattr *attr, | |||
| 1270 | if (!fuse_allow_task(fc, current)) | 1270 | if (!fuse_allow_task(fc, current)) |
| 1271 | return -EACCES; | 1271 | return -EACCES; |
| 1272 | 1272 | ||
| 1273 | if (fc->flags & FUSE_DEFAULT_PERMISSIONS) { | 1273 | if (!(fc->flags & FUSE_DEFAULT_PERMISSIONS)) |
| 1274 | err = inode_change_ok(inode, attr); | 1274 | attr->ia_valid |= ATTR_FORCE; |
| 1275 | if (err) | 1275 | |
| 1276 | return err; | 1276 | err = inode_change_ok(inode, attr); |
| 1277 | } | 1277 | if (err) |
| 1278 | return err; | ||
| 1278 | 1279 | ||
| 1279 | if ((attr->ia_valid & ATTR_OPEN) && fc->atomic_o_trunc) | 1280 | if ((attr->ia_valid & ATTR_OPEN) && fc->atomic_o_trunc) |
| 1280 | return 0; | 1281 | return 0; |
| 1281 | 1282 | ||
| 1282 | if (attr->ia_valid & ATTR_SIZE) { | 1283 | if (attr->ia_valid & ATTR_SIZE) |
| 1283 | err = inode_newsize_ok(inode, attr->ia_size); | ||
| 1284 | if (err) | ||
| 1285 | return err; | ||
| 1286 | is_truncate = true; | 1284 | is_truncate = true; |
| 1287 | } | ||
| 1288 | 1285 | ||
| 1289 | req = fuse_get_req(fc); | 1286 | req = fuse_get_req(fc); |
| 1290 | if (IS_ERR(req)) | 1287 | if (IS_ERR(req)) |