linux-next: manual merge of the vfs tree with the v9fs tree

linux-next: manual merge of the vfs tree with the v9fs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2147 bytes --]

Hi Al,

Today's linux-next merge of the vfs tree got conflicts in
fs/9p/vfs_file.c, fs/9p/vfs_inode_dotl.c and fs/9p/vfs_inode.c between
commit 94876b5bb6a8 ("9P: introduction of a new cache=mmap model") from
the v9fs tree and commit 2b052ff59861 ("9p: make v9fs_cache_inode_
{get,put,set}_cookie empty inlines for !9P_CACHEFS") from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/9p/vfs_file.c
index d1ab081f6a4e,a0df3e73c2b1..000000000000
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@@ -107,12 -105,8 +107,10 @@@ int v9fs_file_open(struct inode *inode
  		v9inode->writeback_fid = (void *) fid;
  	}
  	mutex_unlock(&v9inode->v_mutex);
- #ifdef CONFIG_9P_FSCACHE
 -	if (v9ses->cache)
 +	/* previous check would also set cookie with CACHE_LOOSE?
 +	 * set_cookie does a check if v9inode->fscache anyway... */
 +	if (v9ses->cache == CACHE_FSCACHE)
  		v9fs_cache_inode_set_cookie(inode, file);
- #endif
  	return 0;
  out_error:
  	p9_client_clunk(file->private_data);
diff --cc fs/9p/vfs_inode.c
index fd077485426b,4e65aa903345..000000000000
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@@ -911,10 -901,8 +907,8 @@@ v9fs_vfs_atomic_open(struct inode *dir
  		goto error;
  
  	file->private_data = fid;
- #ifdef CONFIG_9P_FSCACHE
 -	if (v9ses->cache)
 +	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)
  		v9fs_cache_inode_set_cookie(dentry->d_inode, file);
- #endif
  
  	*opened |= FILE_CREATED;
  out:
diff --cc fs/9p/vfs_inode_dotl.c
index e68ca293fc9d,4c10edec26a0..000000000000
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@@ -356,10 -353,8 +354,8 @@@ v9fs_vfs_atomic_open_dotl(struct inode 
  	if (err)
  		goto err_clunk_old_fid;
  	file->private_data = ofid;
- #ifdef CONFIG_9P_FSCACHE
 -	if (v9ses->cache)
 +	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)
  		v9fs_cache_inode_set_cookie(inode, file);
- #endif
  	*opened |= FILE_CREATED;
  out:
  	v9fs_put_acl(dacl, pacl);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the vfs tree with the v9fs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3119 bytes --]

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  net/9p/client.c

between commit:

  c249fb4f9193 ("9p: roll p9_tag_remove into p9_req_put")

from the v9fs tree and commit:

  f0be81780879 ("9p: convert to advancing variant of iov_iter_get_pages_alloc()")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/9p/client.c
index 9aaef9c90666,cb4324211561..000000000000
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@@ -1604,32 -1526,34 +1522,34 @@@ p9_client_read_once(struct p9_fid *fid
  	}
  
  	*err = p9pdu_readf(&req->rc, clnt->proto_version,
- 			   "D", &count, &dataptr);
+ 			   "D", &received, &dataptr);
  	if (*err) {
+ 		if (!non_zc)
+ 			iov_iter_revert(to, count - iov_iter_count(to));
  		trace_9p_protocol_dump(clnt, &req->rc);
 -		p9_tag_remove(clnt, req);
 +		p9_req_put(clnt, req);
  		return 0;
  	}
- 	if (rsize < count) {
- 		pr_err("bogus RREAD count (%d > %d)\n", count, rsize);
- 		count = rsize;
+ 	if (rsize < received) {
+ 		pr_err("bogus RREAD count (%d > %d)\n", received, rsize);
+ 		received = rsize;
  	}
  
  	p9_debug(P9_DEBUG_9P, "<<< RREAD count %d\n", count);
  
  	if (non_zc) {
- 		int n = copy_to_iter(dataptr, count, to);
+ 		int n = copy_to_iter(dataptr, received, to);
  
- 		if (n != count) {
+ 		if (n != received) {
  			*err = -EFAULT;
 -			p9_tag_remove(clnt, req);
 +			p9_req_put(clnt, req);
  			return n;
  		}
  	} else {
- 		iov_iter_advance(to, count);
+ 		iov_iter_revert(to, count - received - iov_iter_count(to));
  	}
 -	p9_tag_remove(clnt, req);
 +	p9_req_put(clnt, req);
- 	return count;
+ 	return received;
  }
  EXPORT_SYMBOL(p9_client_read_once);
  
@@@ -1668,23 -1594,24 +1590,24 @@@ p9_client_write(struct p9_fid *fid, u6
  			break;
  		}
  
- 		*err = p9pdu_readf(&req->rc, clnt->proto_version, "d", &count);
+ 		*err = p9pdu_readf(&req->rc, clnt->proto_version, "d", &written);
  		if (*err) {
+ 			iov_iter_revert(from, count - iov_iter_count(from));
  			trace_9p_protocol_dump(clnt, &req->rc);
 -			p9_tag_remove(clnt, req);
 +			p9_req_put(clnt, req);
  			break;
  		}
- 		if (rsize < count) {
- 			pr_err("bogus RWRITE count (%d > %d)\n", count, rsize);
- 			count = rsize;
+ 		if (rsize < written) {
+ 			pr_err("bogus RWRITE count (%d > %d)\n", written, rsize);
+ 			written = rsize;
  		}
  
  		p9_debug(P9_DEBUG_9P, "<<< RWRITE count %d\n", count);
  
 -		p9_tag_remove(clnt, req);
 +		p9_req_put(clnt, req);
- 		iov_iter_advance(from, count);
- 		total += count;
- 		offset += count;
+ 		iov_iter_revert(from, count - written - iov_iter_count(from));
+ 		total += written;
+ 		offset += written;
  	}
  	return total;
  }

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs tree with the v9fs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1561 bytes --]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
net/9p/protocol.c between commit 6250a8badb31 ("9p: use unsigned
integers for nwqid/count") from the v9fs tree and commit 3f39ef33084b
("net/9p: switch the guts of p9_client_{read,write}() to iov_iter")
from the vfs tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/9p/protocol.c
index 305e4789f2cc,e9d0f0c1a048..000000000000
--- a/net/9p/protocol.c
+++ b/net/9p/protocol.c
@@@ -437,23 -439,13 +439,13 @@@ p9pdu_vwritef(struct p9_fcall *pdu, in
  						 stbuf->extension, stbuf->n_uid,
  						 stbuf->n_gid, stbuf->n_muid);
  			} break;
- 		case 'D':{
- 				uint32_t count = va_arg(ap, uint32_t);
- 				const void *data = va_arg(ap, const void *);
- 
- 				errcode = p9pdu_writef(pdu, proto_version, "d",
- 									count);
- 				if (!errcode && pdu_write(pdu, data, count))
- 					errcode = -EFAULT;
- 			}
- 			break;
- 		case 'U':{
+ 		case 'V':{
 -				int32_t count = va_arg(ap, int32_t);
 +				uint32_t count = va_arg(ap, uint32_t);
- 				const char __user *udata =
- 						va_arg(ap, const void __user *);
+ 				struct iov_iter *from =
+ 						va_arg(ap, struct iov_iter *);
  				errcode = p9pdu_writef(pdu, proto_version, "d",
  									count);
- 				if (!errcode && pdu_write_u(pdu, udata, count))
+ 				if (!errcode && pdu_write_u(pdu, from, count))
  					errcode = -EFAULT;
  			}
  			break;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the vfs tree with the v9fs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 967 bytes --]

Hi Eric,

On Fri, 6 Jan 2012 22:38:57 -0600 Eric Van Hensbergen <ericvh@gmail.com> wrote:
>
> What's typically the right process for me to prep the merge for Linus?
> Should I pull Al's patchset and then apply mine on top of it so I can
> merge your merge fix or just have my for-linus tree based on his
> current working merge (which I assume has Al's by now).  Just a bit
> confused because rebasing was discouraged last merge window -- but not
> sure how to deal with the conflict without a rebase....

Just warn Linus that there will be a conflict with Al's stuff.  You could
supply him with the patch I gave you just for good measure, but he is
good (better then me) at fixing merge conflicts and will ping you if he
has doubts.

i.e. don't rebase or even bother doing the merge yourself.  Just ask him
to pull what was in linux-next.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the vfs tree with the v9fs tree

[Eric Van Hensbergen]

What's typically the right process for me to prep the merge for Linus?
Should I pull Al's patchset and then apply mine on top of it so I can
merge your merge fix or just have my for-linus tree based on his
current working merge (which I assume has Al's by now).  Just a bit
confused because rebasing was discouraged last merge window -- but not
sure how to deal with the conflict without a rebase....

         -eric

On Thu, Jan 5, 2012 at 8:46 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Al,
>
> Today's linux-next merge of the vfs tree got conflicts in
> fs/9p/vfs_inode.c and fs/9p/vfs_inode_dotl.c between commit 5d3851530d6d
> ("9p: Reduce object size with CONFIG_NET_9P_DEBUG") from the v9fs tree
> and commits c2837de73e80 ("9p: don't bother with unixmode2p9mode() for
> link() and symlink()") and 3eda0de677b5 ("9p: propagate umode_t") from
> the vfs tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>
> diff --cc fs/9p/vfs_inode.c
> index c8fe480,e0f20de..0000000
> --- a/fs/9p/vfs_inode.c
> +++ b/fs/9p/vfs_inode.c
> @@@ -127,14 -94,14 +122,14 @@@ static int p9mode2perm(struct v9fs_sess
>   * @rdev: major number, minor number in case of device files.
>   *
>   */
> - static int p9mode2unixmode(struct v9fs_session_info *v9ses,
> -                          struct p9_wstat *stat, dev_t *rdev)
> + static umode_t p9mode2unixmode(struct v9fs_session_info *v9ses,
> +                              struct p9_wstat *stat, dev_t *rdev)
>  {
>        int res;
> -       int mode = stat->mode;
> +       u32 mode = stat->mode;
>
>  -      res = mode & S_IALLUGO;
>        *rdev = 0;
>  +      res = p9mode2perm(v9ses, stat);
>
>        if ((mode & P9_DMDIR) == P9_DMDIR)
>                res |= S_IFDIR;
> @@@ -352,8 -329,8 +346,8 @@@ int v9fs_init_inode(struct v9fs_session
>
>                break;
>        default:
> -               p9_debug(P9_DEBUG_ERROR, "BAD mode 0x%x S_IFMT 0x%x\n",
>  -              P9_DPRINTK(P9_DEBUG_ERROR, "BAD mode 0x%hx S_IFMT 0x%x\n",
>  -                         mode, mode & S_IFMT);
> ++              p9_debug(P9_DEBUG_ERROR, "BAD mode 0x%hx S_IFMT 0x%x\n",
>  +                       mode, mode & S_IFMT);
>                err = -EINVAL;
>                goto error;
>        }
> @@@ -375,7 -352,7 +369,7 @@@ struct inode *v9fs_get_inode(struct sup
>        struct inode *inode;
>        struct v9fs_session_info *v9ses = sb->s_fs_info;
>
> -       p9_debug(P9_DEBUG_VFS, "super block: %p mode: %o\n", sb, mode);
>  -      P9_DPRINTK(P9_DEBUG_VFS, "super block: %p mode: %ho\n", sb, mode);
> ++      p9_debug(P9_DEBUG_VFS, "super block: %p mode: %ho\n", sb, mode);
>
>        inode = new_inode(sb);
>        if (!inode) {
> @@@ -1362,10 -1333,10 +1355,10 @@@ static int v9fs_vfs_mkspecial(struct in
>  static int
>  v9fs_vfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
>  {
>  -      P9_DPRINTK(P9_DEBUG_VFS, " %lu,%s,%s\n", dir->i_ino,
>  -                                      dentry->d_name.name, symname);
>  +      p9_debug(P9_DEBUG_VFS, " %lu,%s,%s\n",
>  +               dir->i_ino, dentry->d_name.name, symname);
>
> -       return v9fs_vfs_mkspecial(dir, dentry, S_IFLNK, symname);
> +       return v9fs_vfs_mkspecial(dir, dentry, P9_DMSYMLINK, symname);
>  }
>
>  /**
> @@@ -1419,14 -1391,16 +1412,16 @@@ clunk_fid
>   */
>
>  static int
> - v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
> + v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
>  {
> +       struct v9fs_session_info *v9ses = v9fs_inode2v9ses(dir);
>        int retval;
>        char *name;
> +       u32 perm;
>
> -       p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %x MAJOR: %u MINOR: %u\n",
>  -      P9_DPRINTK(P9_DEBUG_VFS,
>  -              " %lu,%s mode: %hx MAJOR: %u MINOR: %u\n", dir->i_ino,
>  -              dentry->d_name.name, mode, MAJOR(rdev), MINOR(rdev));
> ++      p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %hx MAJOR: %u MINOR: %u\n",
>  +               dir->i_ino, dentry->d_name.name, mode,
>  +               MAJOR(rdev), MINOR(rdev));
>
>        if (!new_valid_dev(rdev))
>                return -EINVAL;
> diff --cc fs/9p/vfs_inode_dotl.c
> index 73488fb,8ef152a..0000000
> --- a/fs/9p/vfs_inode_dotl.c
> +++ b/fs/9p/vfs_inode_dotl.c
> @@@ -283,8 -283,8 +283,8 @@@ v9fs_vfs_create_dotl(struct inode *dir
>        }
>
>        name = (char *) dentry->d_name.name;
> -       p9_debug(P9_DEBUG_VFS, "name:%s flags:0x%x mode:0x%x\n",
> -                name, flags, omode);
>  -      P9_DPRINTK(P9_DEBUG_VFS, "v9fs_vfs_create_dotl: name:%s flags:0x%x "
> ++      p9_debug(P9_DEBUG_VFS, "v9fs_vfs_create_dotl: name:%s flags:0x%x "
> +                       "mode:0x%hx\n", name, flags, omode);
>
>        dfid = v9fs_fid_lookup(dentry->d_parent);
>        if (IS_ERR(dfid)) {
> @@@ -810,9 -813,9 +810,9 @@@ v9fs_vfs_mknod_dotl(struct inode *dir,
>        struct dentry *dir_dentry;
>        struct posix_acl *dacl = NULL, *pacl = NULL;
>
> -       p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %x MAJOR: %u MINOR: %u\n",
>  -      P9_DPRINTK(P9_DEBUG_VFS,
>  -              " %lu,%s mode: %hx MAJOR: %u MINOR: %u\n", dir->i_ino,
>  -              dentry->d_name.name, omode, MAJOR(rdev), MINOR(rdev));
> ++      p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %hx MAJOR: %u MINOR: %u\n",
>  +               dir->i_ino, dentry->d_name.name, omode,
>  +               MAJOR(rdev), MINOR(rdev));
>
>        if (!new_valid_dev(rdev))
>                return -EINVAL;

linux-next: manual merge of the vfs tree with the v9fs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 4476 bytes --]

Hi Al,

Today's linux-next merge of the vfs tree got conflicts in
fs/9p/vfs_inode.c and fs/9p/vfs_inode_dotl.c between commit 5d3851530d6d
("9p: Reduce object size with CONFIG_NET_9P_DEBUG") from the v9fs tree
and commits c2837de73e80 ("9p: don't bother with unixmode2p9mode() for
link() and symlink()") and 3eda0de677b5 ("9p: propagate umode_t") from
the vfs tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/9p/vfs_inode.c
index c8fe480,e0f20de..0000000
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@@ -127,14 -94,14 +122,14 @@@ static int p9mode2perm(struct v9fs_sess
   * @rdev: major number, minor number in case of device files.
   *
   */
- static int p9mode2unixmode(struct v9fs_session_info *v9ses,
- 			   struct p9_wstat *stat, dev_t *rdev)
+ static umode_t p9mode2unixmode(struct v9fs_session_info *v9ses,
+ 			       struct p9_wstat *stat, dev_t *rdev)
  {
  	int res;
- 	int mode = stat->mode;
+ 	u32 mode = stat->mode;
  
 -	res = mode & S_IALLUGO;
  	*rdev = 0;
 +	res = p9mode2perm(v9ses, stat);
  
  	if ((mode & P9_DMDIR) == P9_DMDIR)
  		res |= S_IFDIR;
@@@ -352,8 -329,8 +346,8 @@@ int v9fs_init_inode(struct v9fs_session
  
  		break;
  	default:
- 		p9_debug(P9_DEBUG_ERROR, "BAD mode 0x%x S_IFMT 0x%x\n",
 -		P9_DPRINTK(P9_DEBUG_ERROR, "BAD mode 0x%hx S_IFMT 0x%x\n",
 -			   mode, mode & S_IFMT);
++		p9_debug(P9_DEBUG_ERROR, "BAD mode 0x%hx S_IFMT 0x%x\n",
 +			 mode, mode & S_IFMT);
  		err = -EINVAL;
  		goto error;
  	}
@@@ -375,7 -352,7 +369,7 @@@ struct inode *v9fs_get_inode(struct sup
  	struct inode *inode;
  	struct v9fs_session_info *v9ses = sb->s_fs_info;
  
- 	p9_debug(P9_DEBUG_VFS, "super block: %p mode: %o\n", sb, mode);
 -	P9_DPRINTK(P9_DEBUG_VFS, "super block: %p mode: %ho\n", sb, mode);
++	p9_debug(P9_DEBUG_VFS, "super block: %p mode: %ho\n", sb, mode);
  
  	inode = new_inode(sb);
  	if (!inode) {
@@@ -1362,10 -1333,10 +1355,10 @@@ static int v9fs_vfs_mkspecial(struct in
  static int
  v9fs_vfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
  {
 -	P9_DPRINTK(P9_DEBUG_VFS, " %lu,%s,%s\n", dir->i_ino,
 -					dentry->d_name.name, symname);
 +	p9_debug(P9_DEBUG_VFS, " %lu,%s,%s\n",
 +		 dir->i_ino, dentry->d_name.name, symname);
  
- 	return v9fs_vfs_mkspecial(dir, dentry, S_IFLNK, symname);
+ 	return v9fs_vfs_mkspecial(dir, dentry, P9_DMSYMLINK, symname);
  }
  
  /**
@@@ -1419,14 -1391,16 +1412,16 @@@ clunk_fid
   */
  
  static int
- v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
+ v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
  {
+ 	struct v9fs_session_info *v9ses = v9fs_inode2v9ses(dir);
  	int retval;
  	char *name;
+ 	u32 perm;
  
- 	p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %x MAJOR: %u MINOR: %u\n",
 -	P9_DPRINTK(P9_DEBUG_VFS,
 -		" %lu,%s mode: %hx MAJOR: %u MINOR: %u\n", dir->i_ino,
 -		dentry->d_name.name, mode, MAJOR(rdev), MINOR(rdev));
++	p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %hx MAJOR: %u MINOR: %u\n",
 +		 dir->i_ino, dentry->d_name.name, mode,
 +		 MAJOR(rdev), MINOR(rdev));
  
  	if (!new_valid_dev(rdev))
  		return -EINVAL;
diff --cc fs/9p/vfs_inode_dotl.c
index 73488fb,8ef152a..0000000
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@@ -283,8 -283,8 +283,8 @@@ v9fs_vfs_create_dotl(struct inode *dir
  	}
  
  	name = (char *) dentry->d_name.name;
- 	p9_debug(P9_DEBUG_VFS, "name:%s flags:0x%x mode:0x%x\n",
- 		 name, flags, omode);
 -	P9_DPRINTK(P9_DEBUG_VFS, "v9fs_vfs_create_dotl: name:%s flags:0x%x "
++	p9_debug(P9_DEBUG_VFS, "v9fs_vfs_create_dotl: name:%s flags:0x%x "
+ 			"mode:0x%hx\n", name, flags, omode);
  
  	dfid = v9fs_fid_lookup(dentry->d_parent);
  	if (IS_ERR(dfid)) {
@@@ -810,9 -813,9 +810,9 @@@ v9fs_vfs_mknod_dotl(struct inode *dir, 
  	struct dentry *dir_dentry;
  	struct posix_acl *dacl = NULL, *pacl = NULL;
  
- 	p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %x MAJOR: %u MINOR: %u\n",
 -	P9_DPRINTK(P9_DEBUG_VFS,
 -		" %lu,%s mode: %hx MAJOR: %u MINOR: %u\n", dir->i_ino,
 -		dentry->d_name.name, omode, MAJOR(rdev), MINOR(rdev));
++	p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %hx MAJOR: %u MINOR: %u\n",
 +		 dir->i_ino, dentry->d_name.name, omode,
 +		 MAJOR(rdev), MINOR(rdev));
  
  	if (!new_valid_dev(rdev))
  		return -EINVAL;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]